pristine-xz: Try --extreme too. While my corpus has no such xz files, Darren Salt...

diff --git a/debian/changelog b/debian/changelog
index b868be06ae8ebb7d3998986624fac4abd2d9d478..5fc2db0fe80ceed5204dadf829d7061933694bae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pristine-tar (1.20) UNRELEASED; urgency=low
+
+  * pristine-xz: Try --extreme too. While my corpus has no such xz files,
+    Darren Salt points out that automake 1.11.2 has started using
+    extreme mode. Closes: #658666
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 12 Feb 2012 14:20:44 -0400
+
 pristine-tar (1.19) unstable; urgency=low
 
   * Fix duplicate function oops.

diff --git a/pristine-xz b/pristine-xz
index 678193e3c84e688af116795f22ad8754ac460f3d..0c2f9d423b3461e9cce9394e233935df0c11b4d8 100755 (executable)
--- a/pristine-xz
+++ b/pristine-xz
@@ -115,7 +115,7 @@ sub readxz {
        #
        # So far in the wild only these levels have been seen.
        # (Note that level 9 can use a lot of memory.)
-       my $possible_levels = [6, 9];
+       my $possible_levels = ["6", "9", "6e", "9e"];
 
        return ($possible_levels);
 }
@@ -186,7 +186,7 @@ sub genxz {
        while (@params) {
                my $param=shift @params;
 
-               next if $param=~/^(-[0-9])$/;
+               next if $param=~/^(-[0-9]e?)$/;
                next if $param eq '-z';
                die "paranoia check failed on params from delta (@params)";
        }