master-bin/detect_well_known_errors.py

@@ -29,7 +29,7 @@ import argparse
 import fcntl
 from collections import deque
 
-import piupartslib
+import piupartslib.conf
 from piupartslib.conf import MissingSection
 from piupartslib.dwke import *
 

piuparts-master-backend.py

@@ -31,7 +31,8 @@ import fcntl
 import time
 import random
 
-import piupartslib
+import piupartslib.conf
+import piupartslib.packagesdb
 from piupartslib.packagesdb import LogfileExists
 from piupartslib.conf import MissingSection
 
@@ -426,6 +427,13 @@ def main():
             pass
     except URLError as e:
         logging.error("ABORT: URLError: " + str(e.reason))
+    except BrokenPipeError:
+        logging.error("ABORT: BrokenPipeError")
+        logging.debug(timestamp() + " disconnected")
+        # https://docs.python.org/3/library/signal.html#note-on-sigpipe
+        devnull = os.open(os.devnull, os.O_WRONLY)
+        os.dup2(devnull, sys.stdout.fileno())
+        sys.exit(1)
 
     logging.debug(timestamp() + " disconnected")
 

piuparts-report.py

@@ -47,7 +47,8 @@ try:
 except:
     pass
 
-import piupartslib
+import piupartslib.conf
+import piupartslib.packagesdb
 from piupartslib.conf import MissingSection
 from piupartslib.dwke import *
 import piupartslib.pkgsummary as pkgsummary
@@ -710,7 +711,7 @@ def write_template_html(filename, body, mapping={}, defer_if_unmodified=False, m
         "piuparts_version": "",
         "time": "",
     })
-    content_md5 = hashlib.md5(htmlpage.safe_substitute(mapping)).hexdigest()
+    content_md5 = hashlib.md5(htmlpage.safe_substitute(mapping).encode()).hexdigest()
 
     if md5cache is not None:
         md5cache['new'][filename] = content_md5
@@ -1532,7 +1533,7 @@ class Section:
 
     def cleanup_removed_packages(self, logs_by_dir):
         vdirs = logs_by_dir.keys()
-        vdirs.remove("reserved")
+        vdirs = vdirs - {"reserved"}
         for vdir in vdirs:
             for log in sorted(logs_by_dir[vdir]):
                 if log.endswith(".log"):
@@ -1558,9 +1559,9 @@ class Section:
     def generate_html(self):
         md5cachefile = os.path.join(self._output_directory, '.md5cache')
         try:
-            with open(md5cachefile, "r") as f:
+            with open(md5cachefile, "rb") as f:
                 self._md5cache['old'] = pickle.load(f)
-        except IOError:
+        except (IOError, EOFError):
             pass
 
         logging.debug("Finding log files")
@@ -1595,7 +1596,7 @@ class Section:
         logging.debug("Wrote %d out of %d html files, refreshed %d out of %d unmodified files" % ( \
                 self._md5cache['written'], len(self._md5cache['new']),
                 self._md5cache['refreshed'], self._md5cache['unmodified']))
-        with open(md5cachefile, "w") as f:
+        with open(md5cachefile, "wb") as f:
             pickle.dump(self._md5cache['new'], f)
 
         logging.debug("Removing old log files")

piuparts.py

@@ -2460,14 +2460,14 @@ def install_upgrade_test(chroot, chroot_state, package_files, packages, old_pack
 def save_meta_data(filename, chroot_state):
     """Save directory tree meta data into a file for fast access later."""
     logging.debug("Saving chroot meta data to %s" % filename)
-    with open(filename, "w") as f:
+    with open(filename, "wb") as f:
         pickle.dump(chroot_state, f)
 
 
 def load_meta_data(filename):
     """Load meta data saved by 'save_meta_data'."""
     logging.debug("Loading chroot meta data from %s" % filename)
-    with open(filename, "r") as f:
+    with open(filename, "rb") as f:
         return pickle.load(f)