[79170] contrib/port_cutleaves/port_cutleaves.in

[jmr at macports.org]

Revision: 79170
          http://trac.macports.org/changeset/79170
Author:   jmr at macports.org
Date:     2011-06-03 22:15:08 -0700 (Fri, 03 Jun 2011)
Log Message:
-----------
port_cutleaves: adapt to registry changes

Modified Paths:
--------------
    contrib/port_cutleaves/port_cutleaves.in

Modified: contrib/port_cutleaves/port_cutleaves.in
===================================================================
--- contrib/port_cutleaves/port_cutleaves.in	2011-06-04 05:07:08 UTC (rev 79169)
+++ contrib/port_cutleaves/port_cutleaves.in	2011-06-04 05:15:08 UTC (rev 79170)
@@ -258,11 +258,20 @@
             }
         }
         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
+            if {[llength [info commands "registry_uninstall::uninstall_composite"]] == 1} {
+                if {[catch {registry_uninstall::uninstall [name $port] [version $port] [revision $port] [variants $port] {}} \
+                            result]} {
+                    set exit_status 1
+                    puts stderr "Error: $result"
+                    continue
+                }
+            } else {
+                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]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110603/7a1afac2/attachment.html>