Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (60bd0f9df3886432d986c90abf28930071c73a87)

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 master sorcery by Jaka Kranjc (60bd0f9df3886432d986c90abf28930071c73a87)
  • Date: Fri, 16 Oct 2009 06:42:07 -0500

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libdispel | 2 +-
var/lib/sorcery/modules/libtrack | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 60bd0f9df3886432d986c90abf28930071c73a87
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtrack, libdispel: match complete lines when comparing md5s, fixes
part of #15192

diff --git a/ChangeLog b/ChangeLog
index 4b9c0f9..c231824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libtrack, libdispel: match complete lines when comparing md5s, fixes
+ part of #15192
+
2009-10-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* protected: added tr for heisenbug #15408
* cast: moved override_grimoires to libsorcery
diff --git a/var/lib/sorcery/modules/libdispel
b/var/lib/sorcery/modules/libdispel
index 6204979..39f2f49 100755
--- a/var/lib/sorcery/modules/libdispel
+++ b/var/lib/sorcery/modules/libdispel
@@ -43,7 +43,7 @@ function reap_config_files() {
[[ $FILE ]] || continue
if [[ $TOTAL_DISPEL ]] ; then
rm -f "$FILE"
- elif grep -q "$(md5sum "$FILE" )" "$MD5S"; then
+ elif grep -qX "$(md5sum "$FILE")" "$MD5S"; then
debug libdispel "$FILE is a config file that hasnt changed,
removing..."
rm -f "$FILE"
else
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 990a763..2399d32 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -322,7 +322,7 @@ function check_if_modified() {
fi
fi
local my_md5=$(md5sum "$to")
- if test -f "$md5_log" && grep -q "$my_md5" "$md5_log"; then
+ if test -f "$md5_log" && grep -qX "$my_md5" "$md5_log"; then
false
else
true



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (60bd0f9df3886432d986c90abf28930071c73a87), Jaka Kranjc, 10/16/2009

Archive powered by MHonArc 2.6.24.

Top of Page