This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 585bed852f5f675d3bb36fe5d91b811e2d9a6eec Author: Osamu Aoki <[email protected]> Date: Sat Sep 5 01:39:52 2015 +0900 uscan: Fix version passed to uupdate uscan: repacksuffix does not ajust version passed to uupdate https://bugs.debian.org/796986 When suffix is added for the repack, uscan did not pass correct new pristine tar version to uupdate. This fix this annoyance by changing uscan behavior based on mk-origtargz output. * change behavior based on the mk-origtargz results * mk-origtargz: print "adding suffix" if so * test_mk-origtargz: update test patten. --- scripts/mk-origtargz.pl | 4 +++- scripts/uscan.pl | 4 +++- test/test_mk-origtargz | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl index ef2c75e..dde2019 100755 --- a/scripts/mk-origtargz.pl +++ b/scripts/mk-origtargz.pl @@ -531,7 +531,9 @@ if ($same_name) { } } -if ($deletecount) { +if ($deletecount and $suffix) { + print ", deleting ${deletecount} files from it and adding suffix"; +} elsif ($deletecount) { print ", deleting ${deletecount} files from it"; } if ($zipfile_deleted) { diff --git a/scripts/uscan.pl b/scripts/uscan.pl index a401544..c966586 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1517,7 +1517,9 @@ EOF to_string => \$mk_origtargz_out, wait_child => 1); chomp($mk_origtargz_out); - $path = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as) ([^,]+)\.$/; + $path = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as) ([^,]+)(?:,.*)?\.$/; + $newversion = $newversion . $options{'repacksuffix'} + if $mk_origtargz_out =~ /Successfully .* adding suffix\.$/; $path = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/; $target = basename($path); } diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz index 7209b4e..a200079 100755 --- a/test/test_mk-origtargz +++ b/test/test_mk-origtargz @@ -418,7 +418,7 @@ testSuffix() { makeDebianDir makeDebianCopyright run_mk_origtargz foo "$expected_stderr_after_removal" \ - "Successfully repacked ../foo-0.1.tar.gz as ../foo_0.1+dfsg1.orig.tar.gz, deleting 19 files from it." \ + "Successfully repacked ../foo-0.1.tar.gz as ../foo_0.1+dfsg1.orig.tar.gz, deleting 19 files from it and adding suffix." \ ../foo-0.1.tar.gz --repack-suffix +dfsg1 assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1+dfsg1.orig.tar.gz ]" assertType application/gzip $TMPDIR/foo_0.1+dfsg1.orig.tar.gz @@ -430,7 +430,7 @@ testSuffixXZ() { makeDebianDir makeDebianCopyright run_mk_origtargz foo "$expected_stderr_after_removal" \ - "Successfully repacked ../foo-0.1.tar.xz as ../foo_0.1+dfsg1.orig.tar.xz, deleting 19 files from it." \ + "Successfully repacked ../foo-0.1.tar.xz as ../foo_0.1+dfsg1.orig.tar.xz, deleting 19 files from it and adding suffix." \ ../foo-0.1.tar.xz --repack-suffix +dfsg1 assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1+dfsg1.orig.tar.xz ]" assertType application/xz $TMPDIR/foo_0.1+dfsg1.orig.tar.xz @@ -442,7 +442,7 @@ testSuffixZip() { makeDebianDir makeDebianCopyright run_mk_origtargz foo "$expected_stderr_after_removal" \ - "Successfully repacked ../foo-0.1.zip as ../foo_0.1+dfsg1.orig.tar.xz, deleting 19 files from it." \ + "Successfully repacked ../foo-0.1.zip as ../foo_0.1+dfsg1.orig.tar.xz, deleting 19 files from it and adding suffix." \ ../foo-0.1.zip --compression xz --repack-suffix +dfsg1 assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1+dfsg1.orig.tar.xz ]" assertType application/xz $TMPDIR/foo_0.1+dfsg1.orig.tar.xz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
