Merge lp:~longsleep/snapcraft/snapcraft-dirs-symlink into lp:~snappy-dev/snapcraft/core

[Simon Eisenmann]

Fix symlinks for directories as well.

Fix symlinks for directories as well.

[Michael Terry (mterry)]

Guh, good catch! I could have sworn I tested that. :(

This method needs a unit test. But I won't block your MP fix on that.

review: Approve

[Michael Terry (mterry)]

Wait... This is probably a trivial change, in legal terms. But I'm not 100% on that. Plus your other branch isn't trivial.

Have you signed the contributor agreement yet? I don't see you as a member of ~contributor-agreement-canonical.

http://www.ubuntu.com/legal/contributors

[Michael Terry (mterry)]

<longsleep> mterry: I gave the contributor agreement to my boss and he will eventually sign it. I think the symlink patch is trivial and you can just merge that. I will let you know when the agreement is signed. Let me know if you have any further comments to the debs plugin.

Alright, will merge this as trivial.

[Leo Arias (elopio)]

A test here would be nice. Do you have a simple scenario that reproduces the problem?
Drop me a line on IRC and I can give you a hand writing the test. I'm elopio.

[Leo Arias (elopio)]

Feel free to land this first, and then the fixed test from https://code.launchpad.net/~elopio/snapcraft/symlinks-2/+merge/267240

review: Approve

=== modified file 'snapcraft/plugins/ubuntu.py'
--- snapcraft/plugins/ubuntu.py	2015-08-06 01:00:44 +0000
+++ snapcraft/plugins/ubuntu.py	2015-08-06 11:20:50 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import itertools
 import logging
 import os
 import subprocess
@@ -119,7 +120,9 @@
            have that, so instead clean those absolute symlinks."""
         debdir = debdir or self.builddir
         for root, dirs, files in os.walk(debdir):
-            for entry in files:
+            # Symlinks to directories will be in dirs, while symlinks to
+            # non-directories will be in files.
+            for entry in itertools.chain(files, dirs):
                 path = os.path.join(root, entry)
                 if os.path.islink(path) and os.path.isabs(os.readlink(path)):
                     target = os.path.join(debdir, os.readlink(path)[1:])