[devscripts] 03/04: ucan: allow more than 2 independent watch lines

[Osamu Aoki]

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

osamu pushed a commit to branch multitar
in repository devscripts.

commit 1a6766e5333fb6765b57b06e2779ae235d17cb72
Author: Osamu Aoki <osamu at debian.org>
Date:   Fri Oct 2 15:19:33 2015 +0000

    ucan: allow more than 2 independent watch lines
    
    Several packages notably KDE ones use the watch file just to watch
    and list 2 possible URLs since there are no simple ways to get the
    latest one.
    
    Basically, they rely on human checking and fall on the safe side of
    listing all possible ones under version=3.  Almost 10 years of history.
    
    Now, this change makes a new main package to reset @components etc.,
    under version=4 to keep the above mentioned traditional behavior.
---
 scripts/uscan.pl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 28f55b1..b768863 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1422,10 +1422,6 @@ B<uscan> invokes the standard B<uupdate> as "B<uupdate> B<--no-symlink
 
 The syntax of the watch file is relaxed to allow more spaces for readability.
 
-Although you can have multiple watch lines with different URLs to keep your eyes
-on a single tarball under the version 3, it is not allowed under the version 4.
-This is to ensure the proper function of B<uupdate>.
-
 If you have custom script in place of B<uupdate>, you may also encounter
 problems.
 
@@ -2415,10 +2411,16 @@ sub process_watchline ($$$$$$)
 	    } else {
 		$origcount++ ;
 		if ($origcount > 1) {
-		    uscan_warn "$progname: too many main upstream tarballs\n";
-		    return 1;
+		    uscan_warn "$progname: more than one main upstream tarballs listed.\n";
 		}
 		$orig = "orig";
+		# reset variables
+		@components = ();
+		$repacksuffix_used =0;
+		$common_newversion = undef;
+		$common_mangled_newversion = undef;
+		$previous_newversion = undef;
+		$previousfile_base = undef;
 	    }
 	}
 

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