This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch multitar in repository devscripts.
commit f31cf9265a2a94385115c64d25c58e7c3e07c301 Author: Osamu Aoki <[email protected]> Date: Sun Sep 27 22:34:34 2015 +0900 mk-origtargz.pl: clarify warning STDOUT of mk-origtargz.pl is trapped by uscan and it shows up later when it DEBUG is enabled. Even worse, Files-excluded: "*/foo" also covers "foo" so if you have both it is very cryptic. At least this change makes it a bit easier for users. (Maybe I should use print instead of warn to its print-out order does not get swapped.) --- scripts/mk-origtargz.pl | 4 ++-- test/test_mk-origtargz | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl index e922805..7a212d6 100644 --- a/scripts/mk-origtargz.pl +++ b/scripts/mk-origtargz.pl @@ -453,14 +453,14 @@ if (@exclude_globs) { $last_match = $info; } } - if ($last_match) { + if (defined $last_match) { $last_match->{used} = 1; } } for my $info (@exclude_info) { if (!$info->{used}) { - warn "No files matched excluded pattern: $info->{glob}\n"; + warn "No files matched excluded pattern as the last matching glob: $info->{glob}\n"; } } diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz index 7209b4e..7d52f33 100755 --- a/test/test_mk-origtargz +++ b/test/test_mk-origtargz @@ -544,7 +544,7 @@ testUnmatchedExclusion() { makeTarBall gz makeDebianDir makeUnmatchedExcludeCopyright - run_mk_origtargz foo "No files matched excluded pattern: nomatch" \ + run_mk_origtargz foo "No files matched excluded pattern as the last matching glob: nomatch" \ "Successfully repacked ../foo-0.1.tar.gz as ../foo_0.1.orig.tar.gz, deleting 19 files from it." \ ../foo-0.1.tar.gz assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1.orig.tar.gz ]" @@ -556,7 +556,7 @@ testDuplicatePattern() { makeTarBall gz makeDebianDir makeDuplicatePatternCopyright - run_mk_origtargz foo "No files matched excluded pattern: exclude-dir1" \ + run_mk_origtargz foo "No files matched excluded pattern as the last matching glob: exclude-dir1" \ "Successfully repacked ../foo-0.1.tar.gz as ../foo_0.1.orig.tar.gz, deleting 19 files from it." \ ../foo-0.1.tar.gz assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1.orig.tar.gz ]" -- 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
