Skip to Content.
Sympa Menu

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

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 (0d5d67450667ed3fd628838d5c5d86ad94dfa82a)
  • Date: Thu, 15 Sep 2011 06:36:29 -0500

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

ChangeLog | 1 +
var/lib/sorcery/modules/libsecurity | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 0d5d67450667ed3fd628838d5c5d86ad94dfa82a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libsecurity: use filename_indicates_compression

diff --git a/ChangeLog b/ChangeLog
index 2a206b3..cfb6208 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* libmisc: added xz and 7z support to display_file
merged show_file from cabal and sorcery
merged display_file into show_file
+ * libsecurity: use filename_indicates_compression

2011-09-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* config: unset GREP_OPTIONS in case the user set it to something bad
diff --git a/var/lib/sorcery/modules/libsecurity
b/var/lib/sorcery/modules/libsecurity
index f6a4e49..e45b8ff 100755
--- a/var/lib/sorcery/modules/libsecurity
+++ b/var/lib/sorcery/modules/libsecurity
@@ -72,12 +72,7 @@ function gaze_checkmd5 () {
fi
if test -z "$PRECACHEDF"
then
- if test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'gzip' &&
- test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'bzip2' &&
- test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'compress'"'"'d'
&&
- test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'Zip' &&
- test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'RPM' &&
- test $(guess_compressor $SOURCE_CACHE/$SOURCE) != 'tar'
+ if ! filename_indicates_compression "$SOURCE_CACHE/$SOURCE"
then
fMD5=`cat $SOURCE_CACHE/$SOURCE 2> /dev/null | md5sum | cut -d' '
-f1 | head -n 1`
else



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0d5d67450667ed3fd628838d5c5d86ad94dfa82a), Jaka Kranjc, 09/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page