Source Mage code commit list

[scm AT mail.sourcemage.org]

------------------------------------------------------------
revno: 27
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Wed 2006-05-03 09:27:27 -0700
message:
  fix bug 10528, install_config_files marks files as new or old

=== modified file 'ChangeLog'
--- ChangeLog   
+++ ChangeLog   
@@ -1,5 +1,7 @@
 2006-05-03 Andrew Stitt <astitt AT sourcemage.org>
        * gaze: fix bug 10465, gaze allows grimoire selection
+       * libresurrect: fix bug 10528, install_config_files marks files
+         as new or old, patch from Jaka Kranjc.
 
 2006-05-01 Andrew Stitt <astitt AT sourcemage.org>
        * libdepends: fix search for default provider

=== modified file 'var/lib/sorcery/modules/libresurrect'
--- var/lib/sorcery/modules/libresurrect        
+++ var/lib/sorcery/modules/libresurrect        
@@ -515,8 +515,8 @@
   while [[ "$continue" == "yes" ]] ; do
     message "${QUERY_COLOR}"
     message "(0) trash $to and install over it"
-    message "(1) backup $to to $to.$savetime, install the new file in its 
place"
-    message "(2) leave $to in its place, copy the new file to $to.$savetime"
+    message "(1) backup $to to $to.$savetime.old, install the new file in 
its place"
+    message "(2) leave $to in its place, copy the new file to 
$to.$savetime.new"
     message "(3) do nothing"
     message "(4) see a diff between $to and the new file"
     # TODO: someday add an option to use an external merge tool
@@ -534,10 +534,10 @@
     case $number in
       0)  cp -pv "$from" "$to"
           break ;;
-      1)  cp -pv "$to" "$to.$savetime"
+      1)  cp -pv "$to" "$to.$savetime.old"
           cp -pv "$from" "$to"
           break ;;
-      2)  cp -pv "$from" "$to.$savetime"
+      2)  cp -pv "$from" "$to.$savetime.new"
           mark_file_modified "$to"
           # this is deliberatly not track_manual, if this is run from
           # FINAL the user might not have wanted the files tracked