[51655] branches/images-and-archives/base/src

[blb at macports.org]

Revision: 51655
          http://trac.macports.org/changeset/51655
Author:   blb at macports.org
Date:     2009-05-29 23:33:09 -0700 (Fri, 29 May 2009)
Log Message:
-----------
Switch from binaryInPath to findBinary

Modified Paths:
--------------
    branches/images-and-archives/base/src/port1.0/portimagefile.tcl
    branches/images-and-archives/base/src/registry1.0/registry.tcl

Modified: branches/images-and-archives/base/src/port1.0/portimagefile.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portimagefile.tcl	2009-05-30 06:23:02 UTC (rev 51654)
+++ branches/images-and-archives/base/src/port1.0/portimagefile.tcl	2009-05-30 06:33:09 UTC (rev 51655)
@@ -58,11 +58,11 @@
         ui_error $err
         return
     }
-    if {[catch {set tarcmd [binaryInPath tar]} err]} {
+    if {[catch {set tarcmd [findBinary tar ${portutil::autoconf::tar_path}]} err]} {
         ui_error $err
         return
     }
-    if {[catch {set bzipcmd [binaryInPath bzip2]} err]} {
+    if {[catch {set bzipcmd [findBinary bzip2 ${portutil::autoconf::bzip2_path}]} err]} {
         ui_error $err
         return
     }
@@ -149,7 +149,7 @@
         if {[catch {_cd $mytempdir} err]} {
             throw MACPORTS $err
         }
-        if {[catch {set tarcmd [binaryInPath tar]} err]} {
+        if {[catch {set tarcmd [findBinary tar ${portutil::autoconf::tar_path}]} err]} {
             throw MACPORTS $err
         }
         if {[catch {system "$tarcmd -xvf $imagefile +IMAGERECEIPT"} err]} {

Modified: branches/images-and-archives/base/src/registry1.0/registry.tcl
===================================================================
--- branches/images-and-archives/base/src/registry1.0/registry.tcl	2009-05-30 06:23:02 UTC (rev 51654)
+++ branches/images-and-archives/base/src/registry1.0/registry.tcl	2009-05-30 06:33:09 UTC (rev 51655)
@@ -483,10 +483,10 @@
 		if {[catch {cd $extractdir} err]} {
 			throw MACPORTS $err
 		}
-		if {[catch {set tarcmd [macports::binaryInPath tar]} err]} {
+		if {[catch {set tarcmd [macports::findBinary tar]} err]} {
 			throw MACPORTS $err
 		}
-		if {[catch {set bzipcmd [macports::binaryInPath bzip2]} err]} {
+		if {[catch {set bzipcmd [macports::findBinary bzip2]} err]} {
 			throw MACPORTS $err
 		}
 		if {[catch {system "$tarcmd -xf $macport_file files.tar.bz2"} err]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090529/e92ab254/attachment-0001.html>