[devscripts] 03/14: Rename directory in renamed tarball to $pkg - $newversion $excludesuffix .orig

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 6586bdda2bff005e1e2b2f94d28571a0896f6b05
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Aug 25 14:29:50 2012 +0200

    Rename directory in renamed tarball to $pkg - $newversion $excludesuffix .orig
    
    DevRef § 6.7.8.2
---
 scripts/uscan.pl |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2ad89e6..1318ea4 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -74,7 +74,7 @@ sub uscan_die (@);
 sub dehs_output ();
 sub quoted_regex_replace ($);
 sub safe_replace ($$);
-sub get_main_source_dir($$$);
+sub get_main_source_dir($$$$);
 
 sub usage {
     print <<"EOF";
@@ -1511,7 +1511,8 @@ EOF
 		system('unzip', '-q', '-a', '-d', $tempdir, "$destdir/$newfile_base") == 0
 		    or uscan_die("Repacking from zip to tar.gz failed (could not unzip)\n");
 	    }
-	    my $main_source_dir = get_main_source_dir($tempdir, $pkg, $newversion);
+	    my $excludesuffix = '+dfsg';
+	    my $main_source_dir = get_main_source_dir($tempdir, $pkg, $newversion, $excludesuffix);
 	    unless ( -d $main_source_dir ) {
 		print STDERR "Error: $main_source_dir is no directory";
 	    }
@@ -1529,7 +1530,6 @@ EOF
 	    if ( $nfiles_before == $nfiles_after ) {
 		print "-- Source tree remains identical - no need for repacking.\n" if $verbose;
 	    } else {
-		my $excludesuffix = '+dfsg' ;
 		my $suffix = 'gz' ;
 		my $newfile_base_dfsg = "${pkg}_${newversion}${excludesuffix}.orig.tar.$suffix" ;
 		system("cd $tempdir; GZIP='-n -9' tar --owner=root --group=root --mode=a+rX -czf \"$absdestdir/$newfile_base_dfsg\" $globpattern") == 0
@@ -2126,8 +2126,8 @@ sub safe_replace($$) {
     }
 }
 
-sub get_main_source_dir($$$) {
-    my ($tempdir, $pkg, $newversion) = @_;
+sub get_main_source_dir($$$$) {
+    my ($tempdir, $pkg, $newversion, $excludesuffix) = @_;
     my $fcount = 0;
     my $main_source_dir = '';
     my $any_dir = '';
@@ -2139,7 +2139,7 @@ sub get_main_source_dir($$$) {
 	    $fcount++;
 	    if (-d $tempdir.'/'.$file) {
 		$any_dir = $tempdir . '/' . $file;
-		$main_source_dir = $any_dir if $file =~ /^$pkg\w*$newversion$/i;
+		$main_source_dir = $any_dir if $file =~ /^$pkg\w*$newversion$excludesuffix\.orig$/i;
 	    }
 	}
     }
@@ -2148,7 +2148,7 @@ sub get_main_source_dir($$$) {
     }
     if ($fcount == 1 and $any_dir) {
 	# Unusual base dir in tarball - should be rather something like ${pkg}-${newversion}
-	$main_source_dir = $tempdir . '/' . $pkg . '-' . $newversion;
+	$main_source_dir = $tempdir . '/' . $pkg . '-' . $newversion . $excludesuffix . '.orig';
 	move($any_dir, $main_source_dir) or uscan_die("Unable to move $any_dir directory $main_source_dir\n");
 	return $main_source_dir;
     }
@@ -2158,7 +2158,7 @@ sub get_main_source_dir($$$) {
 	return $tempdir;
     }
     print "-- Move files to subdirectory $pkg-$newversion.\n" if $verbose;
-    $main_source_dir = $tempdir . '/' . $pkg . '-' . $newversion;
+    $main_source_dir = $tempdir . '/' . $pkg . '-' . $newversion . $excludesuffix . '.orig';
     mkdir($main_source_dir) or uscan_die("Unable to create temporary source directory $main_source_dir\n");
     foreach my $file (@files) {
 	unless ($file =~ /^\.\.?/) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git