Changeset 80587

Timestamp:

07/15/11 07:09:49 (4 years ago)

Author:

jmr@…

Message:

merge r80586 from trunk:

don't use subdir when fetching archive from an explicit porturl

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

@@ -79 +79 @@
     if {[file rootname [file tail $porturl]] == [file rootname [file tail [get_portimage_path]]]} {
         lappend ret [string range $porturl 0 end-[string length [file tail $porturl]]]
+        archive.subdir
     }
     return $ret