[Git][reproducible-builds/diffoscope][master] 2 commits: Explicitly mention when the guestfs module is missing at runtime and we are...

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
729629f9 by Chris Lamb at 2019-03-04T16:07:50Z
Explicitly mention when the guestfs module is missing at runtime and we are falling back to a binary diff. (Closes: reproducible-builds/diffoscope#45)

- - - - -
137fc19e by Chris Lamb at 2019-03-04T18:37:17Z
Provide explicit help when the libarchive system package is missing or "incomplete". (Closes: reproducible-builds/diffoscope#50)

- - - - -


2 changed files:

- diffoscope/comparators/fsimage.py
- diffoscope/main.py


Changes:

=====================================
diffoscope/comparators/fsimage.py
=====================================
@@ -116,5 +116,9 @@ class FsImageFile(File):
                     my_fs, other_fs, None, None, source="filesystem"
                 )
             )
+            if not guestfs:
+                differences.add_comment(
+                    "guestfs not available; falling back to binary diff"
+                )
 
         return differences


=====================================
diffoscope/main.py
=====================================
@@ -694,6 +694,17 @@ def main(args=None):
         args = sys.argv[1:]
     signal.signal(signal.SIGTERM, sigterm_handler)
 
+    try:
+        import libarchive
+    except (ImportError, AttributeError):
+        traceback.print_exc()
+        print(
+            "\nMissing or incomplete libarchive module. Try installing your "
+            "system's 'libarchive' package.",
+            file=sys.stderr,
+        )
+        sys.exit(2)
+
     # Rewrite/support some legacy argument styles
     for val, repl in (
         ('--exclude-directory-metadata', '--exclude-directory-metadata=yes'),



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/e670a3cb92a52868f843b8cc96c13da7b5616d24...137fc19e40a4eabb87b61bfeaa865efe8f455fff

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/e670a3cb92a52868f843b8cc96c13da7b5616d24...137fc19e40a4eabb87b61bfeaa865efe8f455fff
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190304/d407b00c/attachment.html>