[42684] branches/release_1_7

[jmr at macports.org]

Revision: 42684
          http://trac.macports.org/changeset/42684
Author:   jmr at macports.org
Date:     2008-11-29 07:53:35 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
Merge r42683 from trunk

Modified Paths:
--------------
    branches/release_1_7/base/src/upgrade_sources_conf_default.tcl

Property Changed:
----------------
    branches/release_1_7/


Property changes on: branches/release_1_7
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:42683

Modified: branches/release_1_7/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2008-11-29 15:33:36 UTC (rev 42683)
+++ branches/release_1_7/base/src/upgrade_sources_conf_default.tcl	2008-11-29 15:53:35 UTC (rev 42684)
@@ -61,7 +61,9 @@
 
 if {$defaultWritten} {
    set attributes [file attributes ${sourcesConf}]
-   file rename ${sourcesConf} "${sourcesConf}.mpsaved"
+   if {[catch {file rename ${sourcesConf} "${sourcesConf}.mpsaved"}]} {
+      file rename -force ${sourcesConf} "${sourcesConf}.mpsaved_[clock seconds]"
+   }
    file rename ${tempfile} ${sourcesConf}
    eval file attributes ${sourcesConf} $attributes
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/8e9ef23e/attachment.html>