Merge pull request #371 from bundlewrap/symlinks-fixing-fix

Fixes for fixing symlinks

bundlewrap/items/symlinks.py

@@ -50,7 +50,7 @@ def fix(self, status):
             self._fix_type(status)
             return
 
-        for fix_type in ('owner', 'group', 'target'):
+        for fix_type in ('target', 'owner', 'group'):
             if fix_type in status.keys_to_fix:
                 if fix_type == 'group' and 'owner' in status.keys_to_fix:
                     # owner and group are fixed with a single chown

bundlewrap/utils/remote.py

@@ -138,13 +138,7 @@ def size(self):
     def symlink_target(self):
         if not self.is_symlink:
             raise ValueError("{} is not a symlink".format(quote(self.path)))
-        if self.desc.startswith("symbolic link to `"):
-            return self.desc[18:-1]
-        elif self.desc.startswith("broken symbolic link to `"):
-            return self.desc[25:-1]
-        elif self.desc.startswith("symbolic link to "):
-            return self.desc[17:]
-        elif self.desc.startswith("broken symbolic link to "):
-            return self.desc[24:]
-        else:
-            raise ValueError("unable to find target for {}".format(quote(self.path)))
+
+        return force_text(self.node.run(
+            "readlink -- {}".format(quote(self.path)), may_fail=True,
+        ).stdout.strip())