[124478] trunk/base/src/registry2.0/portuninstall.tcl

[jmr at macports.org]

Revision: 124478
          https://trac.macports.org/changeset/124478
Author:   jmr at macports.org
Date:     2014-08-24 13:53:28 -0700 (Sun, 24 Aug 2014)
Log Message:
-----------
more uninstall fixes

Modified Paths:
--------------
    trunk/base/src/registry2.0/portuninstall.tcl

Modified: trunk/base/src/registry2.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry2.0/portuninstall.tcl	2014-08-24 20:45:09 UTC (rev 124477)
+++ trunk/base/src/registry2.0/portuninstall.tcl	2014-08-24 20:53:28 UTC (rev 124478)
@@ -290,15 +290,10 @@
             }
         }
     }
-    
+
     set uports {}
     # create list of all dependencies that will be uninstalled, if requested
     if {[info exists options(ports_uninstall_follow-dependencies)] && [string is true -strict $options(ports_uninstall_follow-dependencies)]} {
-        # don't uninstall dependencies' dependents
-        if {[info exists options(ports_uninstall_follow-dependents)]} {
-            unset options(ports_uninstall_follow-dependents)
-            set optionslist [array get options]
-        }
         set alldeps $all_dependencies
         set portilist {}
         for {set j 0} {$j < [llength $alldeps]} {incr j} {
@@ -339,7 +334,7 @@
             foreach depref $deprefs {
                 set depdeps [registry_uninstall::generate_deplist $depref $optionslist]
                 foreach d $depdeps {
-                    set index [lsearch $alldeps $d]
+                    set index [lsearch -exact $alldeps $d]
                     if {$index == -1} {
                         lappend alldeps $d 
                     }
@@ -348,7 +343,7 @@
         }
         ## User Interaction Question
         # show a list of all dependencies to be uninstalled with a timeout when --follow-dependencies is specified
-        if {[info exists macports::ui_options(questions_yesno)]} {
+        if {[info exists macports::ui_options(questions_yesno)] && [llength $uports] > 0} {
             $macports::ui_options(questions_yesno) "The following dependencies will be uninstalled:" "Timeout_1" $portilist {y} 10
         }
         unset options(ports_uninstall_follow-dependencies)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140824/5a5b561c/attachment.html>