[70126] branches/release_1_9/base/src/package1.0/portarchivefetch.tcl

[jmr at macports.org]

Revision: 70126
          http://trac.macports.org/changeset/70126
Author:   jmr at macports.org
Date:     2010-07-30 00:03:23 -0700 (Fri, 30 Jul 2010)
Log Message:
-----------
merge r69001 from trunk:
 skip archivefetch when -s is used

Revision Links:
--------------
    http://trac.macports.org/changeset/69001

Modified Paths:
--------------
    branches/release_1_9/base/src/package1.0/portarchivefetch.tcl

Modified: branches/release_1_9/base/src/package1.0/portarchivefetch.tcl
===================================================================
--- branches/release_1_9/base/src/package1.0/portarchivefetch.tcl	2010-07-30 07:02:25 UTC (rev 70125)
+++ branches/release_1_9/base/src/package1.0/portarchivefetch.tcl	2010-07-30 07:03:23 UTC (rev 70126)
@@ -208,18 +208,22 @@
 # Initialize archivefetch target and call checkfiles.
 proc portarchivefetch::archivefetch_init {args} {
     variable archivefetch_urls
+    global ports_source_only
 
     if {[option portarchivemode] != "yes"} {
         return -code error "Archive mode is not enabled!"
     }
 
-    portarchivefetch::checkfiles archivefetch_urls
+    if {![tbool ports_source_only]} {
+        portarchivefetch::checkfiles archivefetch_urls
+    }
 }
 
 proc portarchivefetch::archivefetch_start {args} {
-    global UI_PREFIX name
-
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Fetching archive for %s"] $name]"
+    global UI_PREFIX name all_archive_files
+    if {[info exists all_archive_files] && [llength $all_archive_files] > 0} {
+        ui_msg "$UI_PREFIX [format [msgcat::mc "Fetching archive for %s"] $name]"
+    }
 }
 
 # Main archive fetch routine
@@ -229,5 +233,7 @@
     if {[info exists all_archive_files] && [llength $all_archive_files] > 0} {
         # Fetch the files
         return [portarchivefetch::fetchfiles]
+    } else {
+        return 0
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100730/14b2c3b8/attachment.html>