Avoid littering .orig.tar.gz.tmp files around by building intermediate tarball in...

diff --git a/debian/changelog b/debian/changelog
index 734aaa7..bd8af61 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pristine-tar (0.20) UNRELEASED; urgency=low
+
+  * Avoid littering .orig.tar.gz.tmp files around by building intermediate
+    tarball in the temp dir. Closes: #508965
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 29 Dec 2008 15:32:34 -0500
+
 pristine-tar (0.19) unstable; urgency=low
 
   [ Josh Triplett ]

diff --git a/pristine-tar b/pristine-tar
index 249a081..a468ac0 100755 (executable)
--- a/pristine-tar
+++ b/pristine-tar
@@ -362,7 +362,9 @@ sub gentar {
        }
 
        my $recreatetarball=recreatetarball($tempdir, getcwd, clobber_source => 0, %opts);
-       my $out=(-e "$tempdir/wrapper") ? $tarball.".tmp" : $tarball;
+       my $out=(-e "$tempdir/wrapper")
+               ? $tempdir."/".basename($tarball).".tmp"
+               : $tarball;
        doit("xdelta", "patch", "$tempdir/delta", $recreatetarball, $out);
 
        if (-e "$tempdir/wrapper") {