Merge ~juliank/ubuntu-archive-tools:r-a-r-actually-check-queues-correctly into ubuntu-archive-tools:main

[Julian Andres Klode]

Apparently the "skip retrying already queued items" part didn't actually work as it accidentally parsed the queue item "foo {...}" as "foo\n" and then tried to compare it with foo...

[Steve Langasek (vorlon)]

review: Approve

diff --git a/retry-autopkgtest-regressions b/retry-autopkgtest-regressions
index f9b9f51..9ccbc9b 100755
--- a/retry-autopkgtest-regressions
+++ b/retry-autopkgtest-regressions
@@ -23,7 +23,6 @@ from datetime import datetime, timedelta
 import urllib.request
 import urllib.parse
 import argparse
-import io
 import lzma
 import os
 import re
@@ -121,9 +120,7 @@ def already_triggered(release, arch, pkg, triggers, extra_params, running, queue
                 if not queue or not queue_arch == arch:
                     continue
                 for raw_item in queue:
-                    buf = io.StringIO(raw_item)
-                    queued_pkg = buf.readline()
-                    item_params_raw = buf.readline()
+                    queued_pkg, item_params_raw = raw_item.split(None, 1)
                     if not item_params_raw:
                         # it was only one line
                         m = re.search('([^ ^{]*) (.*)', queued_pkg)