Merge lp://qastaging/~mterry/snapcraft/source-tarball into lp://qastaging/~snappy-dev/snapcraft/core

Proposed by Michael Terry
Status: Merged
Merged at revision: 104
Proposed branch: lp://qastaging/~mterry/snapcraft/source-tarball
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Prerequisite: lp://qastaging/~mterry/snapcraft/more-source-options
Diff against target: 222 lines (+106/-8)
7 files modified
debian/control (+3/-0)
integration-tests/data/simple-tar/snapcraft.yaml (+14/-0)
integration-tests/units/jobs.pxu (+14/-0)
plugins/tar-content.yaml (+1/-2)
snapcraft/__init__.py (+42/-1)
snapcraft/plugins/tar_content.py (+3/-5)
snapcraft/tests/test_base_plugin.py (+29/-0)
To merge this branch: bzr merge lp://qastaging/~mterry/snapcraft/source-tarball
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Snappy Developers Pending
Review via email: mp+265170@code.qastaging.launchpad.net

Commit message

Add support for "source-type: tar", rename tgz-content to tar-content, and automatically strip single toplevel directories from unpacked tarballs.

Description of the change

Add support for "source-type: tar", rename tgz-content to tar-content, and automatically strip single toplevel directories from unpacked tarballs.

To post a comment you must log in.
93. By Michael Terry

Guard against empty tar output

Revision history for this message
Ted Gould (ted) wrote :

Couple nits.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

Replied to nits.

94. By Michael Terry

Merge from more-source-options

95. By Michael Terry

Merge from more-source-options

Revision history for this message
Ted Gould (ted) wrote :

Nits discussed.

review: Approve
96. By Michael Terry

Add a basic unit test for isurl

Revision history for this message
Michael Terry (mterry) wrote :

(You're right, I've added a little unit test for isurl to get coverage for it.)

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