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

Proposed by Shih-Yuan Lee
Status: Merged
Approved by: Artur Pak
Approved revision: 689ef68d1d439ce6e1f12ae051b4a6bdc51ebbfc
Merged at revision: 7f6873a5c9bc7d0af6d672db97a0ab2cd80adda0
Proposed branch: ~fourdollars/pc-enablement/+git/oem-scripts:master
Merge into: ~oem-solutions-engineers/pc-enablement/+git/oem-scripts:master
Diff against target: 41 lines (+10/-11)
1 file modified
mir-bug (+10/-11)
Reviewer Review Type Date Requested Status
Artur Pak Approve
Review via email: mp+464187@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Artur Pak (artur-at-work) wrote :

LGTM

review: Approve
Revision history for this message
OEM Taipei Bot (oem-taipei-bot) wrote :

[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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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(
890 for attachment in bug.attachments:890 for attachment in bug.attachments:
891 if "debdiff" in attachment.title:891 if "debdiff" in attachment.title:
892 _run_command(["wget", attachment.data_link, "-O", "data"])892 _run_command(["wget", attachment.data_link, "-O", "data"])
893 if sys.stdout.isatty():893 out, err, _ = _run_command(["interdiff", "data", debdiff])
894 out, err, returncode = _run_command(894 if out:
895 ["colordiff", "-ur", "data", debdiff], returncode=(0, 1)
896 )
897 else:
898 out, err, returncode = _run_command(
899 ["diff", "-ur", "data", debdiff], returncode=(0, 1)
900 )
901 if returncode == 1:
902 warning(895 warning(
903 f"{attachment.title} - {attachment.web_link} has unexpected content."896 f"{attachment.title} - {attachment.web_link} has unexpected content."
904 )897 )
905 info(f"{out}")898 if sys.stdout.isatty():
899 out, err, returncode = _run_command(
900 ["colordiff", "-ur", "data", debdiff], returncode=(0, 1)
901 )
902 info(f"{out}")
903 else:
904 info(f"{out}")
906 found = True905 found = True
907 if update and yes_or_ask(906 if update and yes_or_ask(
908 yes,907 yes,
@@ -912,7 +911,7 @@ def check_and_update_bug_attachments(
912 attachment.removeFromBug()911 attachment.removeFromBug()
913 except lazr.restfulclient.errors.NotFound as e:912 except lazr.restfulclient.errors.NotFound as e:
914 debug(e)913 debug(e)
915 elif returncode == 0:914 else:
916 info(f"{attachment.title} - {attachment.data_link} looks OK.")915 info(f"{attachment.title} - {attachment.data_link} looks OK.")
917 return True916 return True
918917

Subscribers

People subscribed via source and target branches