rebuild-for-athena: better support rebuilding only for -backports

1 files changed, 15 insertions, 7 deletions

diff --git a/bin/rebuild-for-athena b/bin/rebuild-for-athena
index b32db303..cc8f9302 100755
--- a/bin/rebuild-for-athena
+++ b/bin/rebuild-for-athena
@@ -23,15 +23,23 @@ my $git      = Git::Wrapper->new(".");
 my $term     = Term::ReadLine->new("brand");
 die "git commit first\n" unless $git->RUN("status", { porcelain => 1 }) == 0;
 
-rebuild_for_suite($codename);
-system "release-to-athena";
-
-# if we just rebuilt for unstable, also offer to rebuild for stable-backports
-if ($codename eq "unstable") {
-    exit unless $term->ask_yn(prompt => "also rebuild for bullseye-backports?");
-
+if ($codename eq "bullseye-backports") {
     rebuild_for_suite("bullseye-backports", "~bpo11+1");
     system "release-to-athena";
+} elsif ($codename =~ /-backports$/) {
+    die "unknown backports suite";
+} else {
+    rebuild_for_suite($codename);
+    system "release-to-athena";
+
+    # if we just built for unstable, also offer to rebuild for stable-backports
+    if ($codename eq "unstable") {
+	exit unless
+	  $term->ask_yn(prompt => "also rebuild for bullseye-backports?");
+
+	rebuild_for_suite("bullseye-backports", "~bpo11+1");
+	system "release-to-athena";
+    }
 }
 
 sub rebuild_for_suite {