From 2250e384a565a4994d02147d020d5f2e3a05b833 Mon Sep 17 00:00:00 2001
From: joeyh <joeyh@19660600-52fe-0310-9875-adc0d7a7b53c>
Date: Wed, 3 Oct 2007 03:13:58 +0000
Subject: [PATCH] * pristine-tar sometimes got confused about tarballs that did
 not unpack   all files into a subdir. (eg, sear-media)

---
 debian/changelog | 7 +++++++
 pristine-tar     | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4d5c24d..b2dfa1d 100644
--- 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
--- 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";
-- 
2.7.4