[42683] trunk/base/src/upgrade_sources_conf_default.tcl

[jmr at macports.org]

Revision: 42683
          http://trac.macports.org/changeset/42683
Author:   jmr at macports.org
Date:     2008-11-29 07:33:36 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
Cope with the case where sources.conf.mpsaved already exists.

Modified Paths:
--------------
    trunk/base/src/upgrade_sources_conf_default.tcl

Modified: trunk/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- trunk/base/src/upgrade_sources_conf_default.tcl	2008-11-29 14:43:00 UTC (rev 42682)
+++ trunk/base/src/upgrade_sources_conf_default.tcl	2008-11-29 15:33:36 UTC (rev 42683)
@@ -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/78d58748/attachment.html>