[devscripts] 07/07: uscan: Fix version passed to uupdate

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit a5c42ec5d3b51c2b33305865184f76eccbc65e2f
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Sep 5 01:39:52 2015 +0900

    uscan: Fix version passed to uupdate
    
    uscan: repacksuffix does not adjust 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 fixes this annoyance by parsing
    mk-origtargz output.
    
    This is a new simplified fix for #796986.
    
    The old fix was reverted in:
     Revert "uscan: Fix version passed to uupdate"
---
 scripts/uscan.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index b2e12df..36e7d42 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1517,9 +1517,10 @@ 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) ([^,]+)(?:,.*)?\.$/;
 	$path = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/;
 	$target = basename($path);
+	$newversion = $1 if $target =~ m/[^_]+_(.+)\.orig\.tar\.(?:gz|bz2|lzma|xz)$/;
     }
 
     if ($dehs) {

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