[119653] trunk/base/src/macports1.0

jmr at macports.org jmr at macports.org
Fri May 2 18:58:45 PDT 2014


Revision: 119653
          https://trac.macports.org/changeset/119653
Author:   jmr at macports.org
Date:     2014-05-02 18:58:45 -0700 (Fri, 02 May 2014)
Log Message:
-----------
avoid many lines of lappend

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/macports1.0/tests/test.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2014-05-03 00:41:19 UTC (rev 119652)
+++ trunk/base/src/macports1.0/macports.tcl	2014-05-03 01:58:45 UTC (rev 119653)
@@ -1492,11 +1492,7 @@
     set tarcmd [findBinary tar $macports::autoconf::tar_path]
     set tarflags [get_tar_flags [file extension $fetchfile]]
     set qflag $macports::autoconf::tar_q
-    set cmdline {}
-    lappend cmdline "$tarcmd"
-    lappend cmdline "${tarflags}${qflag}xOf"
-    lappend cmdline "$fetchfile"
-    lappend cmdline "+CONTENTS"
+    set cmdline [list $tarcmd ${tarflags}${qflag}xOf $fetchfile +CONTENTS]
     ui_debug $cmdline
     if {![catch {set contents [exec {*}$cmdline]}]} {
         # the file is probably a valid binary archive
@@ -1523,18 +1519,10 @@
 
     # extract the portfile (and possibly files dir if not a binary archive)
     ui_debug "extracting port archive to [pwd]"
-    set cmdline {}
     if {$binary} {
-        lappend cmdline "$tarcmd"
-        lappend cmdline "${tarflags}${qflag}xOf"
-        lappend cmdline "../$fetchfile"
-        lappend cmdline "+PORTFILE"
-        lappend cmdline ">"
-        lappend cmdline "Portfile"
+        set cmdline [list $tarcmd ${tarflags}${qflag}xOf ../$fetchfile +PORTFILE > Portfile]
     } else {
-        lappend cmdline "$tarcmd"
-        lappend cmdline "${tarflags}${qflag}xf"
-        lappend cmdline "$fetchfile"
+        set cmdline [list $tarcmd ${tarflags}${qflag}xf $fetchfile]
     }
     ui_debug $cmdline
     if {[catch {exec {*}$cmdline} result]} {

Modified: trunk/base/src/macports1.0/tests/test.tcl
===================================================================
--- trunk/base/src/macports1.0/tests/test.tcl	2014-05-03 00:41:19 UTC (rev 119652)
+++ trunk/base/src/macports1.0/tests/test.tcl	2014-05-03 01:58:45 UTC (rev 119653)
@@ -41,8 +41,7 @@
         set index [expr {[lsearch $argv $arg] + 1}]
         set level [lindex $argv $index]
         if { $level >= 0 && $level <= 3 } {
-            lappend arguments "-debug"
-            lappend arguments $level
+            lappend arguments -debug $level
         } else {
             puts "Invalid debug level."
             exit 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140502/a7924e90/attachment.html>


More information about the macports-changes mailing list