The following commit has been merged in the master branch:
commit 62acc3abc0fd62292395e1475252a5297b60beee
Author: James Vega <[email protected]>
Date:   Tue Apr 19 22:38:54 2011 -0400

    uscan: Use the correct path when repacking zip files.
    
    Closes: #622889
    Signed-off-by: James Vega <[email protected]>

diff --git a/debian/changelog b/debian/changelog
index bc6d8aa..cb9d717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+devscripts (2.10.73) UNRELEASED; urgency=low
+
+  * uscan: Use the correct path when repacking zip files.  (Closes: #622889)
+
+ -- James Vega <[email protected]>  Tue, 19 Apr 2011 21:57:10 -0400
+
 devscripts (2.10.72) unstable; urgency=low
 
   [ James Vega ]
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 406d3bc..46a50ed 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1376,7 +1376,7 @@ EOF
        my $hidden = ".[!.]*";
        system("unzip -q -a -d $tempdir $destdir/$newfile_base") == 0
          or die("Repacking from zip to tar.gz failed (could not unzip)\n");
-       if (defined glob($hidden)) {
+       if (defined glob("$tempdir/$hidden")) {
            $globpattern .= " $hidden";
        }
        system("cd $tempdir; GZIP=-9 tar --owner=root --group=root --mode=a+rX 
-czf $destdir/$newfile_base_gz $globpattern") == 0

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to [email protected].

Reply via email to