Re: [38038] trunk/base/src/port1.0/portextract.tcl

2008-07-07 Thread Ryan Schmidt 

On Jul 4, 2008, at 21:37, Rainer Müller wrote:

 Ryan Schmidt wrote:

 On Jul 3, 2008, at 23:30, [EMAIL PROTECTED] wrote:

 Revision: 38038
   http://trac.macosforge.org/projects/macports/changeset/ 
 38038
 Author:   [EMAIL PROTECTED]
 Date: 2008-07-03 21:30:56 -0700 (Thu, 03 Jul 2008)
 Log Message:
 ---
 port1.0/portextract.tcl:
 If the $distfile exists in $filespath, use it from there as it was
 not fetched
 to the distpath in this case.

 Why would the distfile be in the filespath?

 'port fetch' checks first if the distfile exists in $filespath and  
 does
 not fetch it to $distpath if it exists there. So 'port fetch' was able
 to work with a distfile in $filespath, but 'port extract' was not.

 I did this change for consistency. We could also remove the check for
 the distfile in $filespath in portfetch, but I think that would  
 apply to
 patchfiles as well which are often in $filespath.

Ah, now I understand. Makes sense.

___
macports-dev mailing list
macports-dev@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macports-dev

Re: [38038] trunk/base/src/port1.0/portextract.tcl

2008-07-04 Thread Ryan Schmidt 
On Jul 3, 2008, at 23:30, [EMAIL PROTECTED] wrote:

 Revision: 38038
   http://trac.macosforge.org/projects/macports/changeset/38038
 Author:   [EMAIL PROTECTED]
 Date: 2008-07-03 21:30:56 -0700 (Thu, 03 Jul 2008)
 Log Message:
 ---
 port1.0/portextract.tcl:
 If the $distfile exists in $filespath, use it from there as it was  
 not fetched
 to the distpath in this case.

Why would the distfile be in the filespath?


 Modified Paths:
 --
 trunk/base/src/port1.0/portextract.tcl

 Modified: trunk/base/src/port1.0/portextract.tcl
 ===
 --- trunk/base/src/port1.0/portextract.tcl2008-07-04 02:58:10 UTC  
 (rev 38037)
 +++ trunk/base/src/port1.0/portextract.tcl2008-07-04 04:30:56 UTC  
 (rev 38038)
 @@ -92,7 +92,7 @@
  }

  proc extract_main {args} {
 -global UI_PREFIX
 +global UI_PREFIX filespath

  if {![exists distfiles]  ![exists extract.only]} {
   # nothing to do
 @@ -101,7 +101,11 @@

  foreach distfile [option extract.only] {
   ui_info $UI_PREFIX [format [msgcat::mc Extracting %s] $distfile]
 - option extract.args [option distpath]/$distfile
 + if {[file exists $filespath/$distfile]} {
 + option extract.args $filespath/$distfile
 + } else {
 + option extract.args [option distpath]/$distfile
 + }
   if {[catch {command_exec extract} result]} {
   return -code error $result
   }


___
macports-dev mailing list
macports-dev@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macports-dev

Re: [38038] trunk/base/src/port1.0/portextract.tcl

2008-07-04 Thread Rainer Müller 
Ryan Schmidt wrote:
 On Jul 3, 2008, at 23:30, [EMAIL PROTECTED] wrote:
 
 Revision: 38038
   http://trac.macosforge.org/projects/macports/changeset/38038
 Author:   [EMAIL PROTECTED]
 Date: 2008-07-03 21:30:56 -0700 (Thu, 03 Jul 2008)
 Log Message:
 ---
 port1.0/portextract.tcl:
 If the $distfile exists in $filespath, use it from there as it was  
 not fetched
 to the distpath in this case.
 
 Why would the distfile be in the filespath?

'port fetch' checks first if the distfile exists in $filespath and does 
not fetch it to $distpath if it exists there. So 'port fetch' was able 
to work with a distfile in $filespath, but 'port extract' was not.

I did this change for consistency. We could also remove the check for 
the distfile in $filespath in portfetch, but I think that would apply to 
patchfiles as well which are often in $filespath.

Rainer
___
macports-dev mailing list
macports-dev@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macports-dev