Changeset 80584

Timestamp:

07/15/11 06:42:37 (4 years ago)

Author:

jmr@…

Message:

merge r80581 from trunk:

don't clear all_archive_files when archive already exists

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/package1.0/portarchivefetch.tcl (modified) (1 diff)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/package1.0/portarchivefetch.tcl

@@ -94 +94 @@
     archiveTypeIsSupported $portarchivetype
 
-    if {[file isfile ${archive.path}]} {
-        ui_debug "Found archive: ${archive.path}"
-        set all_archive_files {}
-        set fetch_urls {}
-    } else {
-        set archive.file [file tail ${archive.path}]
-        lappend all_archive_files ${archive.file}
-        if {[info exists archive_sites]} {
-            lappend fetch_urls archive_sites ${archive.file}
-        }
+    set archive.file [file tail ${archive.path}]
+    lappend all_archive_files ${archive.file}
+    if {[info exists archive_sites]} {
+        lappend fetch_urls archive_sites ${archive.file}
     }
 }