[devscripts] 04/06: uscan: uscan_verbose for more mangle targets

Osamu Aoki osamu at moszumanska.debian.org
Sun Nov 8 14:49:49 UTC 2015


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

osamu pushed a commit to branch multitar
in repository devscripts.

commit 4f3d47f4aff417c245eba68180c5c2b03d6115b1
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Nov 8 12:00:14 2015 +0900

    uscan: uscan_verbose for more mangle targets
---
 scripts/uscan.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 6e0c2e8..9569a36 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3025,6 +3025,7 @@ EOF
 
 	# mangle if necessary
 	$upstream_url =~ s/&/&/g;
+	uscan_verbose "Matching target for downloadurlmangle: $upstream_url\n";
 	if (exists $options{'downloadurlmangle'}) {
 	    foreach my $pat (@{$options{'downloadurlmangle'}}) {
 		uscan_verbose "downloadurlmangle rule $pat\n";
@@ -3046,8 +3047,7 @@ EOF
     uscan_verbose "Upstream URL (downloadurlmangled):\n   $upstream_url\n";
 
     # $newversion = version used for pkg-ver.tar.gz and version comparison
-    uscan_verbose "Newest upstream tarball version selected for download (uversionmangled): $newversion\n" if defined $newversion;
-    uscan_verbose "Download filename (fullpath, pre-filenamemangle): $newfile\n";
+    uscan_verbose "Newest upstream tarball version selected for download (uversionmangled): $newversion\n" if $newversion;
 
     my $newfile_base;
     if (exists $options{'filenamemangle'}) {
@@ -3056,6 +3056,7 @@ EOF
 	} else {
 	    $newfile_base = $newfile;
 	}
+	uscan_verbose "Matching target for filenamemangle: $newfile_base\n";
 	foreach my $pat (@{$options{'filenamemangle'}}) {
 	    uscan_verbose "filenamemangle rule $pat\n";
 	    if (! safe_replace(\$newfile_base, $pat)) {

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



More information about the devscripts-devel mailing list