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

[Sergio Schvezov]

stat and chmod the actual file and not the target when removing suid/guid bits

[lp:~sergiusens/snapcraft/1511161]

259. By Sergio Schvezov on 2015-10-29

stat and chmod the actual file and not the target when removing suid/guid bits

[Leo Arias (elopio)]

Tested in vivid. The test now passes, and the snap can be installed and executed.

review: Approve

=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-10-19 19:54:09 +0000
+++ snapcraft/repo.py	2015-10-29 02:17:15 +0000
@@ -268,9 +268,9 @@
 
 
 def _fix_filemode(path):
-    mode = stat.S_IMODE(os.stat(path).st_mode)
+    mode = stat.S_IMODE(os.stat(path, follow_symlinks=False).st_mode)
     if mode & 0o4000 or mode & 0o2000:
-        logger.debug('Removing suid/guid from {}'.format(path))
+        logger.warning('Removing suid/guid from {}'.format(path))
         os.chmod(path, mode & 0o1777)