This is an automated email from the git hooks/post-receive script. terceiro pushed a commit to branch master in repository devscripts.
commit 109ce16f3ca067e6c01fc69e2112c9923b452b0e Author: Antonio Terceiro <[email protected]> Date: Thu Jan 21 10:05:45 2016 -0200 uscan: ignore 'debian' directories without a 'watch' file Signed-off-by: Antonio Terceiro <[email protected]> --- debian/changelog | 4 ++++ scripts/uscan.pl | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8acf4a..723d09c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ devscripts (2.16.1) UNRELEASED; urgency=medium - fix regression in uscan when --destdir is set (Closes: #809662) Patch by Alex Mestiashvili <[email protected]> - fix crash when --rename is passed + - when scanning for directories called 'debian', ignore the ones that + don't have a file called 'watch'. This removes several annoying warnings + when uscan is run on a package that has several directories called + 'debian' in its upstream source. [ James McCoy ] * checkbashisms: diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 47d317f..4507798 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -2295,12 +2295,6 @@ for my $dir (@dirs) { uscan_verbose "package=\"$package\" version=\"$uversion\" (no epoch/revision)\n"; push @debdirs, [$debversion, $dir, $package, $uversion]; - } elsif (! -r 'debian/watch') { - uscan_warn "Found watch file in $dir,\n but couldn't find/read changelog; skipping\n"; - next; - } elsif (! -f 'debian/watch') { - uscan_warn "Found watch file in $dir,\n but it is not readable; skipping\n"; - next; } } -- 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
