Merge lp:~vorlon/britney/britney1-noact into lp:~ubuntu-release/britney/britney1-ubuntu

[Steve Langasek]

[Utkarsh Gupta (utkarsh)]

Looks good, thanks for the detailed commit message.

review: Approve

[Łukasz Zemczak (sil2100)]

This is good. Let's get this merged.

review: Approve

=== modified file 'britney'
--- britney	2022-11-15 21:44:22 +0000
+++ britney	2023-03-06 19:34:23 +0000
@@ -491,7 +491,13 @@
     # and
     #
     # only do SRU regression emails for the non default series
-    if [ "$SERIES" != "$DEFAULT_SERIES" ]; then
+    if [ -n "$NO_ACT" ]; then
+        # honor a global toggle to disable side-effects (no email, no
+        # triggering tests, no archive updating)
+        sed -i '/^EMAIL_ENABLE/ s/=.*$/= no/' "$2"
+        sed -i '/^SRUREGRESSIONEMAIL_ENABLE/ s/=.*$/= no/' "$2"
+        sed -i '/^ADT_ENABLE/ s/yes/dry-run/' "$2"
+    elif [ "$SERIES" != "$DEFAULT_SERIES" ]; then
         sed -i '/^EMAIL_ENABLE/ s/=.*$/= no/' "$2"
         sed -i '/^SRUREGRESSIONEMAIL_ENABLE/ s/=.*$/= yes/' "$2"
     fi
@@ -578,11 +584,13 @@
   printf " done\n"
 }
 
-if option save_b1; then
-  save b1
-fi
-if option save || option save_b2; then
-  save b2
+if [ -z "$NO_ACT" ]; then
+    if option save_b1; then
+        save b1
+    fi
+    if option save || option save_b2; then
+        save b2
+    fi
 fi
 
 create_uninst_report () {