Commit c43c7389 authored by Mattia Rizzolo's avatar Mattia Rizzolo

Merge branch 'uscan-922131' of salsa.debian.org:yadd/devscripts

MR: debian/devscripts!105Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parents c1dfc940 bb0442c9
......@@ -38,6 +38,8 @@ devscripts (2.19.3) UNRELEASED; urgency=medium
+ Fix dehs output when "group" is used.
+ Avoid false positive warning on USCAN_SYMLINK value.
Closes: #920874; MR: !103
+ Fix exit code when component are used. Closes: #922131; MR: !105
+ Don't parse empty options. Closes: #922132; MR: !105
-- Mattia Rizzolo <mattia@debian.org> Sat, 12 Jan 2019 20:41:40 +0100
......
......@@ -9,10 +9,11 @@ our @EXPORT = (
@Devscripts::Output::EXPORT, qw(
uscan_msg uscan_verbose dehs_verbose uscan_warn uscan_debug uscan_die
dehs_output $dehs $verbose $dehs_tags $dehs_start_output $dehs_end_output
$found
));
# ACCESSORS
our ($dehs, $dehs_tags, $dehs_start_output, $dehs_end_output)
our ($dehs, $dehs_tags, $dehs_start_output, $dehs_end_output, $found)
= (0, {}, 0, 0);
our $progname = basename($0);
......
......@@ -511,7 +511,7 @@ EOF
=~ /^\s*((?:d(?:ownloadurl|irversion)|(?:filenam|pag)e|[ou]version)mangle)\s*=\s*(.+?)\s*$/
) {
$self->$1([split /;/, $2]);
} else {
} elsif ($opt =~ /\S/) {
uscan_warn "unrecognized option $opt";
}
}
......@@ -1065,7 +1065,7 @@ sub cmp_versions {
uscan_msg "Newest version of $self->{pkg} on remote site is "
. "$self->{search_result}->{newversion}, "
. "specified download version is $self->{shared}->{download_version}";
$main::found++;
$found++ unless ($self->versionmode =~ /(?:same|ignore)/);
} elsif ($self->versionmode eq 'newer') {
if ($compver eq 'newer') {
uscan_msg "Newest version of $self->{pkg} on remote site is "
......@@ -1128,7 +1128,6 @@ sub cmp_versions {
. $self->search_result->{newversion}
. ", ignore local version";
$dehs_tags->{'status'} //= "package available";
$main::found++;
} else { # same/previous -- secondary-tarball or signature-file
uscan_die "strange ... <version> stanza = same/previous "
. "should have defined \$download_version";
......
......@@ -2006,11 +2006,11 @@ if ($dehs) {
}
# Did we find any new upstream versions on our wanderings?
our $found = 0;
my $res = 0;
my @wf = find_watch_files($config);
foreach (@wf) {
process_watchfile(@$_);
$res ||= process_watchfile(@$_);
# Are there any warnings to give if we're using dehs?
dehs_output if ($dehs);
......@@ -2021,7 +2021,8 @@ uscan_verbose "Scan finished";
# Are there any warnings to give if we're using dehs?
$dehs_end_output = 1;
dehs_output if ($dehs);
exit($found ? 0 : 1);
exit($res ? $res : $found ? 0 : 1);
#######################################################################
# {{{ code 2: process watchfile by looping over watchline
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment