Merge lp:~cjwatson/ubuntu-archive-publishing/seed-timeout into lp:ubuntu-archive-publishing

[Colin Watson]

Add a timeout when fetching seed files.

[Benjamin Allot (ballot)]

LGTM

review: Approve

=== modified file 'scripts/maintenance-check.py'
--- scripts/maintenance-check.py	2020-04-16 18:24:34 +0000
+++ scripts/maintenance-check.py	2022-07-05 09:34:21 +0000
@@ -293,6 +293,8 @@
 # support timeframe tag used in the Packages file
 SUPPORT_TAG = "Supported"
 
+SEED_TIMEOUT = 15
+
 
 def get_binaries_for_source_pkg(srcname):
     """Return all binary package names for the given source package name.
@@ -374,8 +376,9 @@
     :param version: Code name of the distribution version (e.g. lucid).
     :return: List of strings with the structure file content
     """
-    f = urllib2.urlopen("%s/%s.%s/structure" % (
-            BASE_URL, distroname, version))
+    f = urllib2.urlopen(
+        "%s/%s.%s/structure" % (BASE_URL, distroname, version),
+        timeout=SEED_TIMEOUT)
     structure = f.readlines()
     f.close()
     return structure
@@ -410,7 +413,7 @@
         seedurl = "%s/%s.%s/%s" % (BASE_URL, name, distro, seed)
         logging.debug("looking for '%s'", seedurl)
         try:
-            f = urllib2.urlopen(seedurl)
+            f = urllib2.urlopen(seedurl, timeout=SEED_TIMEOUT)
             for line in f:
                 # Ignore lines that are not package names (headers etc).
                 if line[0] < 'a' or line[0] > 'z':
@@ -576,7 +579,7 @@
     # now check the hints file that is used to overwrite
     # the default seeds
     try:
-        for line in urllib2.urlopen(hints_file):
+        for line in urllib2.urlopen(hints_file, timeout=SEED_TIMEOUT):
             line = line.strip()
             if not line or line.startswith("#"):
                 continue