[svk-commit] r2485 - branches/2.0-releng/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Tue Jul 17 11:33:39 2007
New Revision: 2485

Modified:
   branches/2.0-releng/lib/SVK/XD.pm

Log:
merge from trunk:
 r2393 at trunk:  clkao | 2007-05-08 15:00:54 +0100
 Improve error reporting when failed to save config.


Modified: branches/2.0-releng/lib/SVK/XD.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/XD.pm	(original)
+++ branches/2.0-releng/lib/SVK/XD.pm	Tue Jul 17 11:33:39 2007
@@ -287,14 +287,14 @@
 
     if (-f $oldfile ) { 
       rename ( $oldfile => $ancient_backup ) ||
-	die loc("Couldn't remove your old backup configuration file %1 while writing the new one.", $oldfile);
+	die loc("Couldn't remove your old backup configuration file %1 while writing the new one: %2.\n", $oldfile, $!);
     }
     if (-f $file ) {
         rename ($file => $oldfile) ||
-        	die loc("Couldn't remove your old configuration file %1 while writing the new one.", $file);
+        	die loc("Couldn't remove your old configuration file %1 while writing the new one: %2.\n", $file, $!);
     }
     rename ($tmpfile => $file) ||
-	die loc("Couldn't write your new configuration file %1. A backup has been stored in %2. Please replace %1 with %2 immediately.", $file, $tmpfile);
+	die loc("Couldn't write your new configuration file %1. A backup has been stored in %2. Please replace %1 with %2 immediately: %3.\n", $file, $tmpfile, $!);
 
     if (-f $ancient_backup ) {
       unlink ($ancient_backup) ||