Merge lp://staging/~tribaal/livecd-rootfs/fix-ova-manifest into lp://staging/livecd-rootfs

Proposed by Chris Glass
Status: Merged
Merged at revision: 1455
Proposed branch: lp://staging/~tribaal/livecd-rootfs/fix-ova-manifest
Merge into: lp://staging/livecd-rootfs
Diff against target: 25 lines (+2/-2)
2 files modified
live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary (+1/-1)
live-build/ubuntu-cpc/hooks/042-vagrant.binary (+1/-1)
To merge this branch: bzr merge lp://staging/~tribaal/livecd-rootfs/fix-ova-manifest
Reviewer Review Type Date Requested Status
Robert C Jennings (community) Approve
Dan Watkins (community) Approve
Philip Roche (community) Approve
Ubuntu Core Development Team Pending
Review via email: mp+314682@code.staging.launchpad.net

Description of the change

This branch fixes the OVA generation.

When creating the manifest we passed the .ova extension twice, resulting in an invalide filename.

To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1 on the code changes.

The commit messages should refer to the bug (i.e. (LP: #1627931) and when you commit you can add the '--fixes lp:#####' flag to get the bug in the commit metadata as well (see http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/revision/1446.1.1).

Not a fan of the comment on r1456 as it lacks context without reading r1455, but a merge commit will take care of that.

review: Needs Fixing
Revision history for this message
Philip Roche (philroche) wrote :

Also +1 on code changes

review: Approve
1455. By Chris Glass

This branch fixes the manifest generation in OVA files (LP:1627931)

The .ova file extension was passed twice, resulting in file not found errors in
both the general case and the vagrant-specific file creation.

Revision history for this message
Chris Glass (tribaal) wrote :

Collapsed commits into one and changed commit message (used --fixes).

Revision history for this message
Dan Watkins (oddbloke) :
review: Approve
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

The bug should have a livecd-rootfs bug task so that when the new version of livecd-roots is uploaded the Launchpad janitor will close that bug task. I'll add one and get this merged.

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