Changeset 79518

Timestamp:

06/16/11 07:33:19 (4 years ago)

Author:

jmr@…

Message:

restrict recursing both ways when uninstalling with both --follow-dependencies and --follow-dependents

File:

• trunk/base/src/registry2.0/portuninstall.tcl (modified) (3 diffs)

trunk/base/src/registry2.0/portuninstall.tcl

@@ -114 +114 @@
     # uninstall dependents if requested
     if {[info exists options(ports_uninstall_follow-dependents)] && $options(ports_uninstall_follow-dependents) eq "yes"} {
+        # don't uninstall dependents' dependencies
+        if {[info exists options(ports_uninstall_follow-dependencies)]} {
+            set orig_follow_dependencies $options(ports_uninstall_follow-dependencies)
+            unset options(ports_uninstall_follow-dependencies)
+            set optionslist [array get options]
+        }
         foreach depport [$port dependents] {
             # make sure it's still installed, since a previous dep uninstall may have removed it
@@ -121 +127 @@
                 }
             }
+        }
+        if {[info exists orig_follow_dependencies]} {
+            set options(ports_uninstall_follow-dependencies) $orig_follow_dependencies
+            set optionslist [array get options]
         }
     } else {
@@ -212 +222 @@
     # uninstall dependencies 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]
+        }
         while 1 {
             set remaining_list {}