Skip to content

Commit

Permalink
random changes i apparently had not committed
Browse files Browse the repository at this point in the history
  • Loading branch information
mwhudson committed Jul 15, 2021
1 parent a2192ed commit 9571bd2
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions dput-wrap.pl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
found = False
exit_code = 0
if "[regression potential]" not in bug.description.lower():
if "[regression potential]" not in bug.description.lower() and \
"[where problems could occur]" not in bug.description.lower():
print("bug {} does not appear to follow SRU template".format(bug_number))
exit_code = 1
Expand All @@ -66,7 +67,7 @@
if target.name != source_package_name:
continue
found = True
if task.status not in ["New", "Confirmed", "Triaged", "In Progress"]:
if task.status not in ["New", "Confirmed", "Triaged", "In Progress", "Fix Committed"]:
print("bug %s has task for %s/%s with unsuitable status %s"%(bug_number, distro_series_name, source_package_name, task.status))
exit_code = 1
Expand All @@ -82,14 +83,14 @@
my $version = $c->{Version};
my $distribution = $c->{Distribution};

if ($target eq "ubuntu") {
if ($target eq "ubuntu" || $target eq "ppa:ubuntu-mozilla-security/rust-updates") {
if ($version =~ "ppa") {
die("ppa version to ubuntu")
}
my $devel = qx/ubuntu-distro-info --devel/;
chomp($devel);
if ($distribution eq $devel) {
if ($version =~ /[~+][0-9][0-9]\.[0-9][0-9]/) {
if ($versioncheck && $version =~ /[~+][0-9][0-9]\.[0-9][0-9]/) {
die("do not upload [~+]XX.YY version to devel\n")
}
} else {
Expand Down Expand Up @@ -140,7 +141,7 @@
die "$changes does not close a bug\n";
}
foreach my $bug (split /\s+/,$c->{"Launchpad-Bugs-Fixed"}) {
open(my $fh, "-|", "python", "-c", $check_sru_bug_py, $bug, $source, $distribution);
open(my $fh, "-|", "python3", "-c", $check_sru_bug_py, $bug, $source, $distribution);
my $msg;
while (<$fh>) {
$msg .= $_;
Expand Down

0 comments on commit 9571bd2

Please sign in to comment.