Changeset 81579

Timestamp:

08/01/11 23:58:49 (4 years ago)

Author:

jmr@…

Message:

merge r81577 from trunk:

determine archive type correctly when activating (#30532)

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• 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/portimage.tcl (modified) (1 diff)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/registry2.0/portimage.tcl

@@ -305 +305 @@
         set unarchive.args {}
         set unarchive.pipe_cmd ""
-        set unarchive.type [file tail $location]
+        set unarchive.type [file extension $location]
         switch -regex ${unarchive.type} {
             cp(io|gz) {