From b5819f2553aa1d6ef6ad5e18cf90c52f1f9b36b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 12 Feb 2012 14:23:47 -0400 Subject: [PATCH] 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 --- debian/changelog | 8 ++++++++ pristine-xz | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b868be0..5fc2db0 100644 --- 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 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 678193e..0c2f9d4 100755 --- 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)"; } -- 2.7.4