From 5a94376c994a640eacf0dde526e597c6c607cfed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 2 Apr 2008 13:14:43 -0400
Subject: [PATCH] pristine-tar: Fix some bugs when run on an uncompressed
 tarball.

---
 debian/changelog | 6 ++++++
 pristine-tar     | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3b5574..54bbf5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pristine-tar (0.12) UNRELEASED; urgency=low
+
+  * pristine-tar: Fix some bugs when run on an uncompressed tarball.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Apr 2008 12:36:56 -0400
+
 pristine-tar (0.11) unstable; urgency=low
 
   * Unset $keep, don't keep temp dirs. Oops.
diff --git a/pristine-tar b/pristine-tar
index 991a949..efe0ea2 100755
--- a/pristine-tar
+++ b/pristine-tar
@@ -305,7 +305,7 @@ sub recreatetarball {
 		"--numeric-owner", "-C", "$tempdir/workdir",
 		"--no-recursion", "--mode", "0644", 
 		"--files-from", "$tempdir/manifest");
-
+	
 	return $ret;
 }
 
@@ -439,6 +439,7 @@ sub gendelta {
 		$tarball="$tempdir/origtarball";
 	}
 
+	genmanifest($tarball, "$tempdir/manifest");
 	my $recreatetarball;
 	if (! exists $opts{recreatetarball}) {
 		my $sourcedir="$tempdir/tmp";
@@ -450,13 +451,11 @@ sub gendelta {
 		if ($#out == 0 && -d $out[0]) {
 			$sourcedir=$out[0];
 		}
-		my $recreatetarball=recreatetarball($tempdir, $sourcedir, clobber_source => 1);
+		$recreatetarball=recreatetarball($tempdir, $sourcedir, clobber_source => 1);
 	}
 	else {
 		$recreatetarball=$opts{recreatetarball};
 	}
-	
-	genmanifest($tarball, "$tempdir/manifest");
 
 	my $ret=system("xdelta delta -0 --pristine $recreatetarball $tarball $tempdir/delta") >> 8;
 	# xdelta exits 1 on success if there were differences
-- 
2.7.4