Merge lp:~sergiusens/snapcraft/1500728 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Mask tar files so they are writable and set an extraction parameter to start with a clean build dir

[Michael Vogt (mvo)]

Looks great! One minor comment.

review: Approve

[lp:~sergiusens/snapcraft/1500728]

214. By Sergio Schvezov on 2015-09-29

Added a comment about masking

[Sergio Schvezov (sergiusens)]

review: Approve

=== added file 'integration-tests/data/simple-tar/readonly-files.tar.gz'
Binary files integration-tests/data/simple-tar/readonly-files.tar.gz	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-tar/readonly-files.tar.gz	2015-09-29 08:12:12 +0000 differ
=== modified file 'integration-tests/data/simple-tar/snapcraft.yaml'
--- integration-tests/data/simple-tar/snapcraft.yaml	2015-09-08 11:48:30 +0000
+++ integration-tests/data/simple-tar/snapcraft.yaml	2015-09-29 08:12:12 +0000
@@ -27,6 +27,9 @@
   evil-slash:
     type: tar-content
     source: evil-slash.tar.gz
+  readonly-files:
+    type: tar-content
+    source: readonly-files.tar.gz
   project:
     type: make-project
     source: project.tar.xz

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-23 13:42:57 +0000
+++ integration-tests/units/jobs.pxu	2015-09-29 08:12:12 +0000
@@ -93,7 +93,10 @@
     test -e stage/notopdir
     test -e stage/parent
     test -e stage/slash
+    test -e stage/readonly_file
     test "$(./stage/bin/test)" = "tarproject"
+    # Regression test for https://bugs.launchpad.net/snapcraft/+bug/1500728
+    ${SNAPCRAFT} pull --force
 flags: simple has-leftovers
 
 id: snapcraft/normal/pypi-config

=== modified file 'snapcraft/sources.py'
--- snapcraft/sources.py	2015-09-15 05:17:14 +0000
+++ snapcraft/sources.py	2015-09-29 08:12:12 +0000
@@ -17,6 +17,7 @@
 import logging
 import os
 import os.path
+import shutil
 import tarfile
 import re
 
@@ -130,13 +131,20 @@
         else:
             return True
 
-    def provision(self, dst):
+    def provision(self, dst, clean_target=True):
         # TODO add unit tests.
         if snapcraft.common.isurl(self.source):
             tarball = os.path.join(self.source_dir, os.path.basename(self.source))
         else:
             tarball = os.path.abspath(self.source)
 
+        if clean_target:
+            shutil.rmtree(dst)
+            os.makedirs(dst)
+
+        return self._extract(tarball, dst)
+
+    def _extract(self, tarball, dst):
         with tarfile.open(tarball) as tar:
             def filter_members(tar):
                 """Filters members and member names:
@@ -163,6 +171,9 @@
                         m.name = m.name[len(common + "/"):]
                     # strip leading "/", "./" or "../" as many times as needed
                     m.name = re.sub(r'^(\.{0,2}/)*', r'', m.name)
+                    # We mask all files to be writable to be able to easily
+                    # extract on top.
+                    m.mode = m.mode | 0o222
                     yield m
 
             tar.extractall(members=filter_members(tar), path=dst)