Changeset 81563

Timestamp:

08/01/11 20:51:10 (4 years ago)

Author:

jmr@…

Message:

merge r81562 from trunk:

avoid erroring due to name-conflicting files from archives when on case-insensitive FS (#30373)

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

@@ -250 +250 @@
 ## @return 1 if file needs to be explicitly deleted if we have to roll back, 0 otherwise
 proc _activate_file {srcfile dstfile} {
-    switch [file type $srcfile] {
+    if {[catch {set filetype [file type $srcfile]} result]} {
+        # this can happen if the archive was built on case-sensitive and we're case-insensitive
+        # we know any existing dstfile is ours because we checked for conflicts earlier
+        if {![catch {file type $dstfile}]} {
+            ui_debug "skipping case-conflicting file: $srcfile"
+            return 0
+        } else {
+            error $result
+        }
+    }
+    switch $filetype {
         directory {
             # Don't recursively copy directories