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

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 235
Merged at revision: 234
Proposed branch: lp://qastaging/~sergiusens/snapcraft/1500505
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 106 lines (+44/-4)
4 files modified
plugins/jdk.yaml (+2/-0)
snapcraft/repo.py (+37/-3)
snapcraft/sources.py (+1/-1)
snapcraft/tests/test_repo.py (+4/-0)
To merge this branch: bzr merge lp://qastaging/~sergiusens/snapcraft/1500505
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+273826@code.qastaging.launchpad.net

Commit message

Copy links to packages we did not download and also untarring not world writable.

Description of the change

I'm not sure I like this, if you look at the bug, most of the dangling symlinks are from libraries provided by libc6.

The one I haven't figured out how it go onto my system is the target for /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/cacerts as no package owns it.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

The attempt to merge lp:~sergiusens/snapcraft/1500505 into lp:snapcraft failed. Below is the output from the failed tests.

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmpfqjb5zom/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp4yykp3c4/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpo047wt4b/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
............../tmp/tmp71nc0tyw/abs-to-b will be a dangling symlink
F.....................................................
======================================================================
FAIL: test_fix_symlinks (snapcraft.tests.test_repo.UbuntuTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.lg1XOE/snapcraft/tests/test_repo.py", line 84, in test_fix_symlinks
    self.assertEqual(os.readlink(tempdir + '/abs-to-b'), '/b')
AssertionError: 'b' != '/b'
- b
+ /b
? +

----------------------------------------------------------------------
Ran 103 tests in 2.933s

FAILED (failures=1)

235. By Sergio Schvezov

fixing logic

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches