[67616] contrib/port_cutleaves/port_cutleaves

[perry at macports.org]

Revision: 67616
          http://trac.macports.org/changeset/67616
Author:   perry at macports.org
Date:     2010-05-15 00:42:43 -0700 (Sat, 15 May 2010)
Log Message:
-----------
Keep backward compatibility with MacPorts 1.8.2.

Modified Paths:
--------------
    contrib/port_cutleaves/port_cutleaves

Modified: contrib/port_cutleaves/port_cutleaves
===================================================================
--- contrib/port_cutleaves/port_cutleaves	2010-05-15 06:58:53 UTC (rev 67615)
+++ contrib/port_cutleaves/port_cutleaves	2010-05-15 07:42:43 UTC (rev 67616)
@@ -195,9 +195,13 @@
 
     set leaves {}
     foreach port $installed {
-        set regref [registry::open_entry [name $port] [version $port] [revision $port] [variants $port] [epoch $port]]
+        if {${macports::registry.format} eq "receipt_sqlite"} {
+            set regref [registry::open_entry [name $port] [version $port] [revision $port] [variants $port] [epoch $port]]
+        } else {
+            set regref [registry::open_entry [name $port] [version $port] [revision $port] [variants $port]]
+        }
         if {![registry::property_retrieve $regref requested]
-            && [registry::list_dependents [name $port] [version $port] [revision $port] [variants $port]] eq ""
+            && [registry::list_dependents [name $port]] eq ""
             && ![should_be_excluded $port $exclusions]
             && (!$option(b) || ![info exists build_deps([name $port])])} {
             lappend leaves $port
@@ -252,14 +256,20 @@
                 continue
             }
         }
-        if {[catch {registry_uninstall::uninstall [name $port] \
-                                                  [composite_version $port] {}} \
-                   result]} {
-            set exit_status 1
-            puts stderr "Error: $result"
-        } else {
-            lappend uninstalled [full_name $port]
+        if {[llength [info commands "registry_uninstall::uninstall"]] == 1} {
+            if {[catch {registry_uninstall::uninstall [name $port] [composite_version $port] {}} \
+                        result]} {
+                set exit_status 1
+                puts stderr "Error: $result"
+                continue
+            }
+        } elseif {[catch {portuninstall::uninstall [name $port] [composite_version $port] {}} \
+                         result]} {
+                set exit_status 1
+                puts stderr "Error: $result"
+                continue
         }
+        lappend uninstalled [full_name $port]
     }
     return $uninstalled
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100515/b3f05828/attachment.html>