[129380] contrib/mpab

jmr at macports.org jmr at macports.org
Thu Dec 11 12:02:28 PST 2014


Revision: 129380
          https://trac.macports.org/changeset/129380
Author:   jmr at macports.org
Date:     2014-12-11 12:02:28 -0800 (Thu, 11 Dec 2014)
Log Message:
-----------
mpab: remove compatibilty code for old base versions

Modified Paths:
--------------
    contrib/mpab/chroot-scripts/archivepath.tcl
    contrib/mpab/chroot-scripts/genportlist.tcl
    contrib/mpab/oldports.tcl
    contrib/mpab/subports.tcl

Modified: contrib/mpab/chroot-scripts/archivepath.tcl
===================================================================
--- contrib/mpab/chroot-scripts/archivepath.tcl	2014-12-11 19:59:44 UTC (rev 129379)
+++ contrib/mpab/chroot-scripts/archivepath.tcl	2014-12-11 20:02:28 UTC (rev 129380)
@@ -42,19 +42,16 @@
     exit 1
 } elseif {[llength $::argv] >= 3 && [lindex $argv 0] eq "-i"} {
     set prefixFromInterp [file dirname [file dirname [lindex $argv 1]]]
-    if {$prefixFromInterp eq "/usr" && [file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-        source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
-    } elseif {$prefixFromInterp ne $prefix} {
+    if {$prefixFromInterp ne $prefix} {
         if {[file executable ${prefix}/bin/port-tclsh]} {
             exec ${prefix}/bin/port-tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            exit 0
         } else {
-            exec /usr/bin/tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            puts stderr "No port-tclsh found in ${prefix}/bin"
+            exit 1
         }
-        exit 0
     }
     set ::argv [lrange $::argv 2 end]
-} elseif {[file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-    source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
 }
 
 package require macports

Modified: contrib/mpab/chroot-scripts/genportlist.tcl
===================================================================
--- contrib/mpab/chroot-scripts/genportlist.tcl	2014-12-11 19:59:44 UTC (rev 129379)
+++ contrib/mpab/chroot-scripts/genportlist.tcl	2014-12-11 20:02:28 UTC (rev 129380)
@@ -41,19 +41,16 @@
 
 if {[llength $::argv] >= 2 && [lindex $argv 0] eq "-i"} {
     set prefixFromInterp [file dirname [file dirname [lindex $argv 1]]]
-    if {$prefixFromInterp eq "/usr" && [file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-        source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
-    } elseif {$prefixFromInterp ne $prefix} {
+    if {$prefixFromInterp ne $prefix} {
         if {[file executable ${prefix}/bin/port-tclsh]} {
             exec ${prefix}/bin/port-tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            exit 0
         } else {
-            exec /usr/bin/tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            puts stderr "No port-tclsh found in ${prefix}/bin"
+            exit 1
         }
-        exit 0
     }
     set ::argv [lrange $::argv 2 end]
-} elseif {[file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-    source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
 }
 
 package require macports
@@ -86,12 +83,12 @@
 
 
 if {[catch {mportinit "" "" ""} result]} {
-   puts "$errorInfo"
+   puts stderr "$errorInfo"
    error "Failed to initialize ports sytem: $result"
 }
 
 if {[catch {set search_result [mportlistall]} result]} {
-   puts "$errorInfo"
+   puts stderr "$errorInfo"
    error "Failed to find any ports: $result"
 }
 

Modified: contrib/mpab/oldports.tcl
===================================================================
--- contrib/mpab/oldports.tcl	2014-12-11 19:59:44 UTC (rev 129379)
+++ contrib/mpab/oldports.tcl	2014-12-11 20:02:28 UTC (rev 129380)
@@ -56,18 +56,15 @@
 if {[info exists interp_path]} {
     set prefixFromInterp [file dirname [file dirname $interp_path]]
     # make sure we're running in the port-tclsh associated with the correct prefix
-    if {$prefixFromInterp eq "/usr" && [file isfile ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-        source ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
-    } elseif {$prefixFromInterp ne $macportsPrefix} {
+    if {$prefixFromInterp ne $macportsPrefix} {
         if {[file executable ${macportsPrefix}/bin/port-tclsh]} {
             exec ${macportsPrefix}/bin/port-tclsh $argv0 {*}[lrange $origArgv 2 end] <@stdin >@stdout 2>@stderr
+            exit 0
         } else {
-            exec /usr/bin/tclsh $argv0 {*}[lrange $origArgv 2 end] <@stdin >@stdout 2>@stderr
+            puts stderr "No port-tclsh found in ${macportsPrefix}/bin"
+            exit 1
         }
-        exit 0
     }
-} elseif {[file isfile ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-    source ${macportsPrefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
 }
 
 package require macports

Modified: contrib/mpab/subports.tcl
===================================================================
--- contrib/mpab/subports.tcl	2014-12-11 19:59:44 UTC (rev 129379)
+++ contrib/mpab/subports.tcl	2014-12-11 20:02:28 UTC (rev 129380)
@@ -42,19 +42,16 @@
     exit 1
 } elseif {[llength $::argv] >= 3 && [lindex $argv 0] eq "-i"} {
     set prefixFromInterp [file dirname [file dirname [lindex $argv 1]]]
-    if {$prefixFromInterp eq "/usr" && [file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-        source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
-    } elseif {$prefixFromInterp ne $prefix} {
+    if {$prefixFromInterp ne $prefix} {
         if {[file executable ${prefix}/bin/port-tclsh]} {
             exec ${prefix}/bin/port-tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            exit 0
         } else {
-            exec /usr/bin/tclsh $argv0 {*}[lrange $::argv 2 end] <@stdin >@stdout 2>@stderr
+            puts stderr "No port-tclsh found in ${prefix}/bin"
+            exit 1
         }
-        exit 0
     }
     set ::argv [lrange $::argv 2 end]
-} elseif {[file isfile ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl]} {
-    source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl
 }
 
 package require macports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141211/e909aab3/attachment.html>


More information about the macports-changes mailing list