[134399] contrib/restore_ports/restore_ports.tcl

[jmr at macports.org]

Revision: 134399
          https://trac.macports.org/changeset/134399
Author:   jmr at macports.org
Date:     2015-03-24 09:08:27 -0700 (Tue, 24 Mar 2015)
Log Message:
-----------
restore_ports: remove more code that was only needed for old base versions

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

Modified: contrib/restore_ports/restore_ports.tcl
===================================================================
--- contrib/restore_ports/restore_ports.tcl	2015-03-24 16:00:39 UTC (rev 134398)
+++ contrib/restore_ports/restore_ports.tcl	2015-03-24 16:08:27 UTC (rev 134399)
@@ -81,13 +81,6 @@
             }
         }
         #ui_msg "variants = $variants"
-        if {[llength [info commands mport_filtervariants]] > 0} {
-            set filtered_variants [mport_filtervariants $variants no]
-        } else {
-            # platform variants don't exist in trunk/1.9
-            set filtered_variants $variants
-        }
-        #ui_msg "filtered_variants = $filtered_variants"
         set active 0
         if {[llength $port] > 2 && [lindex $port 2] == "(active)"} {
             set active 1
@@ -100,10 +93,10 @@
         } else {
             incr port_in_list($name)
         }
-        if {![info exists port_deps(${name},${filtered_variants})]} {
-            set port_deps(${name},${filtered_variants}) [dependenciesForPort $name $filtered_variants]
+        if {![info exists port_deps(${name},${variants})]} {
+            set port_deps(${name},${variants}) [dependenciesForPort $name $variants]
         }
-        lappend newList [list $active $name $filtered_variants]
+        lappend newList [list $active $name $variants]
     }
 
     set operationList [list]
@@ -150,7 +143,7 @@
         set variations [lindex $op 1]
         set active [lindex $op 2]
 
-        if {!$active || [vercmp [macports::version] 1.9.1] < 0} {
+        if {!$active} {
             set install_target install
         } else {
             set install_target activate
@@ -186,13 +179,6 @@
         }
         
         # XXX some ports may be reactivated to fulfil dependencies - check again at the end?
-        if {[vercmp [macports::version] 1.9.1] < 0 && !$active} {
-            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: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150324/1d6503e8/attachment-0001.html>