Skia has proposed merging ~hyask/autopkgtest-cloud:skia/fix_push-amqp into
autopkgtest-cloud:master.
Requested reviews:
Canonical's Ubuntu QA (canonical-ubuntu-qa)
For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464402
I may have missed those two things when backporting the cowboy to `master` in
the last "fix push-amqp" MP.
--
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~hyask/autopkgtest-cloud:skia/fix_push-amqp into autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/push-amqp b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/push-amqp
index 5e5ae94..80f70e2 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/push-amqp
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/push-amqp
@@ -83,7 +83,9 @@ def main():
else:
while True:
message = sys.stdin.readline()
- if message.startswith("b'") and message.endswith("'"):
+ if not message:
+ break
+ if message.startswith("b'") and message.endswith("'\n"):
# this is most likely bytes that we need to interpret as a string
# `literal_eval` is far safer than a true `eval`: the warnings
# around it in the documentation mostly mention denial of
@@ -99,8 +101,6 @@ def main():
file=sys.stderr,
)
continue
- if not message:
- break
try:
push(message, queue_name, ch)
except (
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
