From 65784fca2a211853ee8619c9d18c9c08c0a43d47 Mon Sep 17 00:00:00 2001
From: Peter Law <PeterJCLaw@gmail.com>
Date: Sat, 27 Jan 2018 16:19:23 +0000
Subject: [PATCH 1/2] Simplify compression when rebuilding the apt repo

---
 debian/control |  1 -
 sb-update      | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 852a15c..ff58fab 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Depends: ${misc:Depends},
          systemd-sysv,
          tar,
          usbmount (>= 0.0.24),
-         xz-utils,
 Description: Automagic running of USB sticks
  Runs .autorun files from mounted USB sticks - or other filesystems -
  automatically, and safely containerised.
diff --git a/sb-update b/sb-update
index 8447e9e..ad3406e 100755
--- a/sb-update
+++ b/sb-update
@@ -2,6 +2,7 @@
 
 import argparse
 import logging
+import lzma
 import pathlib
 import subprocess
 import tempfile
@@ -30,21 +31,12 @@ def argument_parser():
 def rebuild_apt_repo():
     logging.debug("Rebuilding apt repo")
 
-    with (SB_DEBS_PATH / 'Packages.xz').open('wb') as packages_xz:
-        scanpackages_process = subprocess.Popen(
+    with lzma.open(SB_DEBS_PATH / 'Packages.xz', mode='wb') as packages_xz:
+        subprocess.check_call(
             ['dpkg-scanpackages', '.', '/dev/null'],
             cwd=SB_DEBS,
-            stdout=subprocess.PIPE,
-        )
-        subprocess.check_call(
-            ['xz', '-3', '-'],
-            stdin=scanpackages_process.stdout,
             stdout=packages_xz,
         )
-        retcode = scanpackages_process.wait()
-
-        if retcode:
-            raise subprocess.CalledProcessError(retcode, 'dpkg-scanpackages')
 
 
 def update_and_upgrade():

From cc4c9171ce4a4278030cbfd870425194ebd7de46 Mon Sep 17 00:00:00 2001
From: Peter Law <PeterJCLaw@gmail.com>
Date: Sat, 27 Jan 2018 17:00:36 +0000
Subject: [PATCH 2/2] Ignore lack of types from lzma

---
 sb-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sb-update b/sb-update
index ad3406e..7f89c81 100755
--- a/sb-update
+++ b/sb-update
@@ -2,7 +2,7 @@
 
 import argparse
 import logging
-import lzma
+import lzma  # type: ignore
 import pathlib
 import subprocess
 import tempfile