Changeset 81368

Timestamp:

07/29/11 17:24:42 (4 years ago)

Author:

jmr@…

Message:

merge r81146 from trunk:

move setting of startpwd outside the try block in extract_archive_to_tmpdir, so it will fail with its own error message instead of the finally block failing

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

@@ -281 +281 @@
 proc extract_archive_to_tmpdir {location} {
     set extractdir [mkdtemp [file join [macports::gettmpdir] mpextractXXXXXXXX]]
+    set startpwd [pwd]
 
     try {
-        set startpwd [pwd]
         if {[catch {cd $extractdir} err]} {
             throw MACPORTS $err