Merge lp://qastaging/~mvo/snapcraft/fix-ubuntu-excludes into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Michael Vogt
| Status: | Merged |
|---|---|
| Approved by: | Michael Vogt |
| Approved revision: | 90 |
| Merged at revision: | 95 |
| Proposed branch: | lp://qastaging/~mvo/snapcraft/fix-ubuntu-excludes |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
| Diff against target: |
63 lines (+18/-2) 3 files modified
snapcraft/plugin.py (+9/-0) snapcraft/plugins/ubuntu.py (+1/-1) snapcraft/tests/test_plugin.py (+8/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mvo/snapcraft/fix-ubuntu-excludes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
| Michael Terry (community) | Approve | ||
|
Review via email:
|
|||
Commit message
make excludes in ubuntu plugin relative paths
Description of the change
This branch makes the excludes in the ubuntu plugin relativ and also
adds checks in the snap_files() code to ensure that users do not put
absolute paths there (alternatively we could make the relative
automatically if they are absolute?).
The reason is that a absolute path in os.path.join() will discard the
previous path components. This lead to incomplete excludes, i.e. the
includes/ where all part of the py3 snap. This branch fixes this.
To post a comment you must log in.
Revision history for this message
| Snappy Tarmac (snappydevtarmac) wrote | # |
Revision history for this message
| Michael Terry (mterry) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Ah good catch, thanks :)