* pristine-tar sometimes got confused about tarballs that did not unpack

  all files into a subdir. (eg, sear-media)

diff --git a/debian/changelog b/debian/changelog
index 4d5c24d..b2dfa1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pristine-tar (0.3) UNRELEASED; urgency=low
+
+  * pristine-tar sometimes got confused about tarballs that did not unpack
+    all files into a subdir. (eg, sear-media)
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 02 Oct 2007 23:13:08 -0400
+
 pristine-tar (0.2) unstable; urgency=low
 
   * Added pristine-gz, thanks to paravoid for making this possible!

diff --git a/pristine-tar b/pristine-tar
index 78ccb80..f9e6e20 100755 (executable)
--- a/pristine-tar
+++ b/pristine-tar
@@ -125,9 +125,14 @@ sub gentarball {
                                $subdir=$1;
                        }
                }
+               else {
+                       debug("found file not in subdir: $file");
+                       $subdir="";
+                       last;
+               }
        }
 
-       if ($subdir) {
+       if (length $subdir) {
                debug("subdir is $subdir");
                doit("mkdir", "$tempdir/workdir");
                $subdir="/$subdir";