Merge ~jslarraz/review-tools:fix-plasma into review-tools:master

[Jorge Sancho Larraz]

Fix for the error mentioned in https://code.launchpad.net/~evancaville/review-tools/+git/review-tools/+merge/466828

The expected outcome is review tools raising a Runtime exception related to unsquashfs failing (it finds some files with xattr). The review should fail because of this runtime exception

[Alex Murray (alexmurray)]

LGTM!

review: Approve

diff --git a/bin/snap-review b/bin/snap-review
index 777f418..299473e 100755
--- a/bin/snap-review
+++ b/bin/snap-review
@@ -9,7 +9,7 @@ import shutil
 import sys
 import tempfile
 import textwrap
-import traceback
+import logging
 
 from reviewtools.common import (
     MKDTEMP_PREFIX,
@@ -150,9 +150,12 @@ def main():
 
             review_report = review.do_checks()
             report.update(review_report)
-        except Exception:
-            print("Caught exception (setting rc=1 and continuing):")
-            traceback.print_exc(file=sys.stdout)
+        except Exception as e:
+            if args.verbose:
+                logging.exception("Caught exception (setting rc=1 and continuing):")
+            report.add_result(
+                "runtime-errors", "error", "msg", str(e), manual_review=True
+            )
             rc = 1
 
     # Write out our state
diff --git a/reviewtools/containers/squashfs_container.py b/reviewtools/containers/squashfs_container.py
index 4896bbb..9ebd26d 100644
--- a/reviewtools/containers/squashfs_container.py
+++ b/reviewtools/containers/squashfs_container.py
@@ -1,6 +1,11 @@
 import os
 import shutil
-from reviewtools.common import cmd, cmdIgnoreErrorStrings, UNSQUASHFS_IGNORED_ERRORS
+from reviewtools.common import (
+    cmd,
+    cmdIgnoreErrorStrings,
+    UNSQUASHFS_IGNORED_ERRORS,
+    recursive_rm,
+)
 from reviewtools.containers.base_container import BaseContainer, ContainerException
 
 
@@ -89,12 +94,12 @@ class SquashfsContainer(BaseContainer):
         (rc, out) = cmdIgnoreErrorStrings(cmd, UNSQUASHFS_IGNORED_ERRORS)
         if rc != 0:
             if os.path.isdir(stage_dir):
-                shutil.rmtree(stage_dir)
+                recursive_rm(stage_dir)
             raise RuntimeError("unpacking failed with '%d':\n%s" % (rc, out))
 
         # Update on success
         if self._unpack_dir is not None and os.path.exists(self._unpack_dir):
-            shutil.rmtree(self._unpack_dir)
+            recursive_rm(self._unpack_dir)
         self._unpack_dir = ".".join(self.filename.split(".")[:-1])
         shutil.move(stage_dir, self._unpack_dir)
         return self._unpack_dir