Skip to Content.
Sympa Menu

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

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 (e5c9b04c1182d695c1d37da8ef7ad868d74ca143)
  • Date: Sun, 24 Jun 2012 11:28:55 -0500

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

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

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

libunpack, libmisc: also detect old style xz archives #347

fixes #347

diff --git a/ChangeLog b/ChangeLog
index 22c054c..bd28d03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libunpack, libmisc: also detect old style xz archives #347
+
2012-04-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* dl_svn: do a repo upgrade if necessary #336
* libtablet: fixed error checking in tablet_check_version_cache #378
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 4960726..ed33b42 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1690,7 +1690,7 @@ function show_file() {
fi ;;
bzip2*) bzcat "$file" | $PAGER ;;
gzip*) gzip -cd "$file" | $PAGER ;;
- XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
+ xz*|XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
7-zip*) 7z -d "$file" | $PAGER ;;
*) message "Unknown file type."
return 1 ;;
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index e48ce70..7e19f15 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -195,7 +195,7 @@ function uncompress_core() {
Zip) cat "$1" ;;
RPM) rpmunpack < "$1" | gzip -cd ;;
tar) cat "$1" ;;
- XZ) xz -cdf "$1" ;;
+ xz|XZ) xz -cdf "$1" ;;
LZMA) xz -cdf "$1" ;;
7-zip) cat "$1" ;; # 7z supports stdout, but it unpacks at the
same time
*) cat "$1" ;;
@@ -218,7 +218,7 @@ function unpack_core() {
debug "libgrimoire" "unpack_core - $*"

case "$2" in
- bzip2|gzip|compress*|tar|XZ|LZMA)
+ bzip2|gzip|compress*|tar|XZ|xz|LZMA)
if real_list_find "$3" same-permissions; then
tar -xf /dev/stdin 2> /dev/null
else



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (e5c9b04c1182d695c1d37da8ef7ad868d74ca143), Jaka Kranjc, 06/24/2012

Archive powered by MHonArc 2.6.24.

Top of Page