Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

 ChangeLog                                  |    5 +++++
 var/lib/sorcery/modules/dl_handlers/dl_git |    2 +-
 var/lib/sorcery/modules/libresurrect       |   14 +++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 760f7d435e592d03de0e3e409f7363a25f19cce0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libresurrect: fixed installing of spell files from user owned
          grimoires #14576

commit be9f43eccd3f3ae78b63b02784eabf6f964107df
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    dl_git: fixed syntax error

diff --git a/ChangeLog b/ChangeLog
index fb77873..329c16e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * dl_git: fixed syntax error
+       * libresurrect: fixed installing of spell files from user owned
+         grimoires #14576
+
 2009-05-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * delve.8: added delve manpage based on the draft in #15094 by Donald
          Johnson
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_git 
b/var/lib/sorcery/modules/dl_handlers/dl_git
index d6e7d4b..95546b5 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_git
+++ b/var/lib/sorcery/modules/dl_handlers/dl_git
@@ -50,7 +50,7 @@ function dl_git_get () {
           echo git checkout $GIT_TAG &&
           git checkout $GIT_TAG
         else
-          # already on the correct branch
+          : # already on the correct branch
         fi
       else
         echo git checkout -b $GIT_TAG origin/$GIT_TAG &&
diff --git a/var/lib/sorcery/modules/libresurrect 
b/var/lib/sorcery/modules/libresurrect
index 7c2cf10..fbf1f92 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -451,7 +451,7 @@ function internal_install_config_file() {
   # out where it points to and so something, but thats too annoying
   if test -h "$from" ; then
     mkdir -p "$(smgl_dirname "$to")" &&
-    cp -pv --no-dereference "$from" "$to"
+    cp -v --no-dereference --preserve=mode,timestamps "$from" "$to"
     return $?
   fi
 
@@ -459,7 +459,7 @@ function internal_install_config_file() {
   if ! test -e "$to" || [[ $STAGED_INSTALL == on ]] ; then
     # copy the new one in (plus leading directories)
     mkdir -p "$(smgl_dirname "$to")" &&
-    cp -pv "$from" "$to"
+    cp -v --preserve=mode,timestamps "$from" "$to"
   # to get here the file must exist
   elif test -d "$to"; then
     message "Trying to install a file ($from) to what was a directory ($to), 
I dont know what to do!"
@@ -487,7 +487,7 @@ function internal_install_config_file() {
     else
       # replace the file
       mkdir -p "$(smgl_dirname "$to")" &&
-      cp -pv "$from" "$to"
+      cp -v --preserve=mode,timestamps "$from" "$to"
     fi
   fi
 }
@@ -535,12 +535,12 @@ function real_handle_changed_config() {
     done
     echo
     case $number in
-      0)  cp -pv "$from" "$to"
+      0)  cp -v --preserve=mode,timestamps "$from" "$to"
           break ;;
-      1)  cp -pv "$to" "$to.$savetime.old"
-          cp -pv "$from" "$to"
+      1)  cp -v --preserve=mode,timestamps "$to" "$to.$savetime.old"
+          cp -v --preserve=mode,timestamps "$from" "$to"
           break ;;
-      2)  cp -pv "$from" "$to.$savetime.new"
+      2)  cp -v --preserve=mode,timestamps "$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