summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes6
-rw-r--r--quilt/scripts/inspect.in13
2 files changed, 18 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index 1897787..b6bddfa 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Nov 27 18:36:27 CET 2009 - jdelvare@suse.de
+
+- Some (possibly all) versions of "file" do not recognize lzma-
+ compressed files. Rely on the file name for these.
+
+-------------------------------------------------------------------
Fri Nov 27 15:26:22 CET 2009 - jdelvare@suse.de
- Fix support of lzma- or xz-compressed files:
diff --git a/quilt/scripts/inspect.in b/quilt/scripts/inspect.in
index 0bef35b..471669d 100644
--- a/quilt/scripts/inspect.in
+++ b/quilt/scripts/inspect.in
@@ -87,7 +87,18 @@ do
echo "md5sum < $file" >&2
set -- $(md5sum < "$file")
echo "$1 $basename"
- case "$(file -b "$file")" in
+
+ case "$file" in
+ *.lzma)
+ # file doesn't reliably recognize lzma-compressed files
+ filetype="lzma"
+ ;;
+ *)
+ filetype="$(file -b "$file")"
+ ;;
+ esac
+
+ case "$filetype" in
compress*|gzip*)
echo -n "g" >&4
echo "gzip -cd $file | md5sum" >&2