Commit 26496468 authored by Mattia Rizzolo's avatar Mattia Rizzolo

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

MR: debian/devscripts!99Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parents 8e4b03fd dd9dee34
......@@ -24,6 +24,9 @@ devscripts (2.18.12) UNRELEASED; urgency=medium
+ push_repo: allow to push even if the project already exists. MR: !97
* uscan:
+ Fix warning when grouped package is up to date.
+ Fix dehs output when using --report with pgpmode next/previous.
Closes: #918994; MR: !99
+ Fix dehs output for grouped packages. MR: !99
* French translation update.
[ Benjamin Drung ]
......
......@@ -314,7 +314,7 @@ sub process_group {
my ($self) = @_;
# Build version
my @cur_versions = split /\+~/, $self->pkg_version;
my @new_versions;
my (@new_versions, @last_debian_mangled_uversions, @last_versions);
my $download = 0;
my $last_shared = $self->shared;
my $last_comp_version;
......@@ -364,12 +364,22 @@ sub process_group {
$self->{status} += $line->status;
return $self->{status};
}
if ($line->type eq 'group') {
push @new_versions, $line->shared->{common_mangled_newversion}
|| $line->shared->{common_newversion}
|| ()
if ($line->type eq 'group');
|| ();
push @last_versions, $line->shared->{lastversion};
push @last_debian_mangled_uversions,
$line->shared->{mangled_lastversion};
}
}
my $last_version = join '+~', @new_versions;
$dehs_tags->{'upstream-version'} = $last_version;
$dehs_tags->{'debian-uversion'} = join('+~', @last_versions)
if (grep { $_ } @last_versions);
$dehs_tags->{'debian-mangled-uversion'} = join '+~',
@last_debian_mangled_uversions
if (grep { $_ } @last_debian_mangled_uversions);
foreach my $line (@{ $self->watchlines }) {
my $path = $line->destfile or next;
my $ver = $line->shared->{common_mangled_newversion};
......
......@@ -343,7 +343,7 @@ sub parse {
my $watchfile = $self->watchfile;
my ($action, $base, $basedir, $filepattern, $lastversion, $pattern, $site);
$dehs_tags = { package => $self->pkg };
$dehs_tags->{package} = $self->pkg;
# Start parsing the watch line
if ($self->watch_version == 1) {
......@@ -1042,7 +1042,7 @@ sub cmp_versions {
$dehs_tags->{'debian-uversion'} = $self->parse_result->{lastversion};
$dehs_tags->{'debian-mangled-uversion'} = $mangled_lastversion;
$dehs_tags->{'upstream-version'} = $self->search_result->{newversion};
$dehs_tags->{'upstream-url'} = $self->upstream_url;
$dehs_tags->{'upstream-url'} //= $self->upstream_url;
my $mangled_ver
= Dpkg::Version->new("1:${mangled_lastversion}-0", check => 0);
......
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