Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (5902aa94f190ef255cb605d60e5a9acdbd525428)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (5902aa94f190ef255cb605d60e5a9acdbd525428)
  • Date: Wed, 27 May 2009 05:48:53 -0500

GIT changes to test-1.14 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 5 +++++
etc/sorcery/version | 2 +-
var/lib/sorcery/modules/dl_handlers/dl_git | 2 +-
var/lib/sorcery/modules/libresurrect | 14 +++++++-------
4 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 5902aa94f190ef255cb605d60e5a9acdbd525428
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

1.14.4-rc2

commit 495ed174f37c2ac6f585cfec49773a1eec1852e4
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

(cherry-picked from commit 760f7d435e592d03de0e3e409f7363a25f19cce0)

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

dl_git: fixed syntax error
(cherry picked from commit be9f43eccd3f3ae78b63b02784eabf6f964107df)

diff --git a/ChangeLog b/ChangeLog
index 5dff82b..9269268 100755
--- 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/etc/sorcery/version b/etc/sorcery/version
index 4b9d466..84f8162 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.4-rc1
+1.14.4-rc2
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 f451004..a3d4fe4 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -447,7 +447,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 "$(dirname "$to")" &&
- cp -pv --no-dereference "$from" "$to"
+ cp -v --no-dereference --preserve=mode,timestamps "$from" "$to"
return $?
fi

@@ -455,7 +455,7 @@ function internal_install_config_file() {
if ! test -e "$to" || [[ $STAGED_INSTALL == on ]] ; then
# copy the new one in (plus leading directories)
mkdir -p "$(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
@@ -484,7 +484,7 @@ function internal_install_config_file() {
else
# replace the file
mkdir -p "$(dirname "$to")" &&
- cp -pv "$from" "$to"
+ cp -v --preserve=mode,timestamps "$from" "$to"
fi
fi
}
@@ -532,12 +532,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



  • [SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (5902aa94f190ef255cb605d60e5a9acdbd525428), Jaka Kranjc, 05/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page