Merge ~fourdollars/pc-enablement/+git/oem-scripts:master into ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master

[Shih-Yuan Lee]

This commit is based on the discussions of https://code.launchpad.net/~fourdollars/ubuntu-archive-tools/+git/ubuntu-archive-tools/+merge/464103.

[Artur Pak (artur-at-work)]

LGTM

review: Approve

[OEM Taipei Bot (oem-taipei-bot)]

[autopkgtest]
pkg-iot-meta PASS
pkg-somerville-meta PASS
pkg-stella-meta PASS
pkg-sutton-meta PASS
bug-bind PASS
get-private-ppa PASS
lp-api PASS
lp-bug PASS
pkg-list PASS
review-merge-proposal PASS
run-autopkgtest PASS
setup-apt-dir PASS
bootstrap-meta FAIL non-zero exit status 1
mir-bug PASS
oem-meta-packages PASS
git-url-insteadof-setting PASS
lp-dl-attm PASS
recovery-from-iso.sh PASS

https://oem-share.canonical.com/partners/lyoncore/share/artifacts/oem-scripts/oem-scripts-2.1-689ef68-in-linux-container-jammy

diff --git a/mir-bug b/mir-bug
index 5d35159..09d3aa1 100755
--- a/mir-bug
+++ b/mir-bug
@@ -890,19 +890,18 @@ def check_and_update_bug_attachments(
         for attachment in bug.attachments:
             if "debdiff" in attachment.title:
                 _run_command(["wget", attachment.data_link, "-O", "data"])
-                if sys.stdout.isatty():
-                    out, err, returncode = _run_command(
-                        ["colordiff", "-ur", "data", debdiff], returncode=(0, 1)
-                    )
-                else:
-                    out, err, returncode = _run_command(
-                        ["diff", "-ur", "data", debdiff], returncode=(0, 1)
-                    )
-                if returncode == 1:
+                out, err, _ = _run_command(["interdiff", "data", debdiff])
+                if out:
                     warning(
                         f"{attachment.title} - {attachment.web_link} has unexpected content."
                     )
-                    info(f"{out}")
+                    if sys.stdout.isatty():
+                        out, err, returncode = _run_command(
+                            ["colordiff", "-ur", "data", debdiff], returncode=(0, 1)
+                        )
+                        info(f"{out}")
+                    else:
+                        info(f"{out}")
                     found = True
                     if update and yes_or_ask(
                         yes,
@@ -912,7 +911,7 @@ def check_and_update_bug_attachments(
                             attachment.removeFromBug()
                         except lazr.restfulclient.errors.NotFound as e:
                             debug(e)
-                elif returncode == 0:
+                else:
                     info(f"{attachment.title} - {attachment.data_link} looks OK.")
                     return True