Merge lp:~cjwatson/charms/trusty/ubuntu-repository-cache/signed-is-metadata into lp:charms/trusty/ubuntu-repository-cache

Proposed by Colin Watson
Status: Work in progress
Proposed branch: lp:~cjwatson/charms/trusty/ubuntu-repository-cache/signed-is-metadata
Merge into: lp:charms/trusty/ubuntu-repository-cache
Diff against target: 11 lines (+1/-0)
1 file modified
lib/ubuntu_repository_cache/mirror.py (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/charms/trusty/ubuntu-repository-cache/signed-is-metadata
Reviewer Review Type Date Requested Status
Charles Butler (community) Needs Resubmitting
Pen Gale (community) Needs Fixing
Review Queue (community) automated testing Needs Fixing
Review via email: mp+295823@code.launchpad.net

Commit message

Handle dists/*/*/signed the same way as dists/*/*/uefi.

Description of the change

Handle dists/*/*/signed the same way as dists/*/*/uefi.

This may have been part of the cause of the problems seen in https://bugs.launchpad.net/launchpad/+bug/1585853 (though by no means the sole cause).

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

14:34:43 Odd_Bloke | cjwatson: How will existing deployments be affected by that ubuntu-repository-cache change?
14:37:06 cjwatson | Odd_Bloke: All it does is sync that directory later in the process, with pool and the other stuff that's transferred in bulk. No migration issues.

Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4426/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/4406/

review: Needs Fixing (automated testing)
Revision history for this message
Pen Gale (pengale) wrote :

This currently fails two tests when I run bundletester against my local lxd envronment. "make lint" fails, and 110-multi_unit.simple fails.

Tracebacks here: http://paste.ubuntu.com/18176623/

The linter is probably a simple fix: you need to reference the version of flake8 in your venv in your Makefile (.venv/bin/flake8) rather than the system version, as the Makefile currently does.

I'm not 100% certain what is happening with the other traceback. It might be a timing issue. If you can't reproduce it locally, ping me in the comments here (or on freenode#juju -- my handle is "petevg"), and I will dig into it further.

review: Needs Fixing
Revision history for this message
Charles Butler (lazypower) wrote :

Greetings Colin,

Thank you for your submission against the ubuntu-repository-cache charm! I've taken some time to look into this, and have some concerns that will need to be addressed before this branch can be merged.

The first is it appears that the ubuntu-repository-cache upstream has actually moved from the requested branch to lp:~cloudware/charms/trusty/ubuntu-repository-cache/trunk. That leaves this merge proposal orphaned and will need to resubmit against the proper branch.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>, or ask a question tagged with "juju" on http://askubuntu.com.

review: Needs Resubmitting

Unmerged revisions

212. By Colin Watson

Handle dists/*/*/signed the same way as dists/*/*/uefi.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/ubuntu_repository_cache/mirror.py'
2--- lib/ubuntu_repository_cache/mirror.py 2015-09-28 20:43:45 +0000
3+++ lib/ubuntu_repository_cache/mirror.py 2016-05-26 12:07:20 +0000
4@@ -85,6 +85,7 @@
5 '--exclude=dists/*/*/debian-installer',
6 '--exclude=dists/*/*/dist-upgrader-all',
7 '--exclude=dists/*/*/installer*',
8+ '--exclude=dists/*/*/signed',
9 '--exclude=dists/*/*/uefi',
10 )
11 host.rsync(rsync_source,

Subscribers

People subscribed via source and target branches

to all changes: