[79171] contrib/restore_ports/restore_ports.tcl

[jmr at macports.org]

Revision: 79171
          http://trac.macports.org/changeset/79171
Author:   jmr at macports.org
Date:     2011-06-03 22:18:44 -0700 (Fri, 03 Jun 2011)
Log Message:
-----------
restore_ports: adapt to registry changes

Modified Paths:
--------------
    contrib/restore_ports/restore_ports.tcl

Modified: contrib/restore_ports/restore_ports.tcl
===================================================================
--- contrib/restore_ports/restore_ports.tcl	2011-06-04 05:15:08 UTC (rev 79170)
+++ contrib/restore_ports/restore_ports.tcl	2011-06-04 05:18:44 UTC (rev 79171)
@@ -184,10 +184,18 @@
         
         # XXX some ports may be reactivated to fulfil dependencies - check again at the end?
         if {!$active} {
-            if {[catch {portimage::deactivate $name "" [list ports_nodepcheck 1]} result]} {
-                global errorInfo
-                ui_debug "$errorInfo"
-                return -code error "port deactivate failed: $result"
+            if {[llength [info commands "portimage::deactivate_composite"]] == 1} {
+                if {[catch {portimage::deactivate $name "" "" 0 [list ports_nodepcheck 1]} result]} {
+                    global errorInfo
+                    ui_debug "$errorInfo"
+                    return -code error "port deactivate failed: $result"
+                }
+            } else {
+                if {[catch {portimage::deactivate $name "" [list ports_nodepcheck 1]} result]} {
+                    global errorInfo
+                    ui_debug "$errorInfo"
+                    return -code error "port deactivate failed: $result"
+                }
             }
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110603/c928707d/attachment.html>