From: Don Armstrong Date: Thu, 14 Mar 2013 19:59:41 +0000 (-0700) Subject: Merge branch 'don/fix_encoding' X-Git-Tag: release/2.6.0~313 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=04265c83beff7e1ccb28a88ff7257fe36b2fc45d;hp=03115a2dbff942931b91ff106865a935de17db8e;p=debbugs.git Merge branch 'don/fix_encoding' --- diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 44463ba..9587624 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -1579,7 +1579,11 @@ sub set_found { if (not @svers) { @svers = $version; } - else { + elsif (not grep {$version eq $_} @svers) { + # The $version was not equal to one of the source + # versions, so it's probably unqualified (or just + # wrong). Delete it, and use the source versions + # instead. if (exists $found_versions{$version}) { delete $found_versions{$version}; $found_removed{$version} = 1; diff --git a/Makefile b/Makefile index 7d427c6..5876704 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,9 @@ build: test: $(PERL) -MTest::Harness -I. -e 'runtests(glob(q(t/*.t)))' +test_%: t/%.t + $(PERL) -MTest::Harness -I. -e 'runtests(q($<))' + testcover: PERLLIB=t/cover_lib/ cover -test diff --git a/scripts/gen-indices b/scripts/gen-indices index d2cd904..0fe8ea8 100755 --- a/scripts/gen-indices +++ b/scripts/gen-indices @@ -41,7 +41,7 @@ gen-indices - Generates index files for the cgi scripts =over -=itme B<--quick> +=item B<--quick> Only update changed bugs diff --git a/t/01_pod.t b/t/01_pod.t index 1d7c422..8fb590f 100644 --- a/t/01_pod.t +++ b/t/01_pod.t @@ -2,4 +2,4 @@ use Test::More; eval "use Test::Pod 1.00"; plan skip_all => "Test::Pod 1.00 required for testing POD" if $@; -all_pod_files_ok(); +all_pod_files_ok(all_pod_files('.'));