Changeset 79865

Timestamp:

06/28/11 12:34:32 (4 years ago)

Author:

jmr@…

Message:

merge r79864 from trunk:

fix moving broken symlinks when force activating (#29952)

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

@@ -464 +464 @@
                         # files to a backup file, both in the filesystem and in the
                         # registry
-                        if { [file exists $file] } {
+                        if { ![catch {file type $file}] } {
                             set bakfile "${file}${baksuffix}"
                             ui_warn "File $file already exists.  Moving to: $bakfile."