Merge lp:~mvo/click-reviewers-tools/squashfs-fixes into lp:click-reviewers-tools

[Michael Vogt]

Tiny branch that skips the raw_unpack_pkg() and hashes.yaml validation on snappy systems.

[lp:~mvo/click-reviewers-tools/squashfs-fixes]

540. By Michael Vogt on 2015-10-27

patch clickreviews.cr_lint.is_squashfs by default

[Jamie Strandboge (jdstrand)]

LGTM, thanks!

review: Approve

=== modified file 'clickreviews/cr_common.py'
--- clickreviews/cr_common.py	2015-10-27 08:51:12 +0000
+++ clickreviews/cr_common.py	2015-10-27 16:27:54 +0000
@@ -703,6 +703,9 @@
     pkg = fn
     if not pkg.startswith('/'):
         pkg = os.path.abspath(pkg)
+    # nothing to do for squashfs images
+    if is_squashfs(pkg):
+        return ""
 
     if dest is not None and os.path.exists(dest):
         error("'%s' exists. Aborting." % dest)

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2015-10-27 08:51:12 +0000
+++ clickreviews/cr_lint.py	2015-10-27 16:27:54 +0000
@@ -1225,6 +1225,9 @@
         '''Check snappy hashes.yaml'''
         if not self.is_snap:
             return
+        # no hashes.yaml for squashfs images
+        if is_squashfs(self.click_package):
+            return
 
         def _check_allowed_perms(mode, allowed):
             '''Check that mode only uses allowed perms'''

=== modified file 'clickreviews/cr_tests.py'
--- clickreviews/cr_tests.py	2015-10-16 02:54:07 +0000
+++ clickreviews/cr_tests.py	2015-10-27 16:27:54 +0000
@@ -367,6 +367,7 @@
     patches.append(patch(
         'clickreviews.cr_framework.ClickReviewFramework._has_framework_in_metadir',
         _has_framework_in_metadir))
+    patches.append(patch("clickreviews.cr_lint.is_squashfs", lambda x: False))
 
     return patches