Changeset 79171

Timestamp:

06/03/11 22:18:44 (4 years ago)

Author:

jmr@…

Message:

restore_ports: adapt to registry changes

File:

• contrib/restore_ports/restore_ports.tcl (modified) (1 diff)

contrib/restore_ports/restore_ports.tcl

@@ -185 +185 @@
         # 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"
+                }
             }
         }