Merge lp:~ahasenack/charms/trusty/glance-simplestreams-sync/gs3-retry-apt-update into lp:~landscape/charms/trusty/glance-simplestreams-sync/landscape

Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 70
Merged at revision: 70
Proposed branch: lp:~ahasenack/charms/trusty/glance-simplestreams-sync/gs3-retry-apt-update
Merge into: lp:~landscape/charms/trusty/glance-simplestreams-sync/landscape
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~ahasenack/charms/trusty/glance-simplestreams-sync/gs3-retry-apt-update
Reviewer Review Type Date Requested Status
Bogdana Vereha (community) Approve
Adam Collard (community) Approve
Review via email: mp+299355@code.launchpad.net

Commit message

Tell apt_update() to retry the operation, and fail hard if it doesn't succeed after several attempts.

Description of the change

Tell apt_update() to retry the operation, and fail hard if it doesn't succeed after several attempts. This is what charmhelpers' configure_source() does after adding a new apt source.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

+1

review: Approve
Revision history for this message
Bogdana Vereha (bogdana) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2016-06-23 08:11:24 +0000
3+++ hooks/hooks.py 2016-07-06 20:48:26 +0000
4@@ -206,7 +206,7 @@
5 return
6 os.mkdir(directory)
7
8- apt_update()
9+ apt_update(fatal=True)
10
11 apt_install(packages=['python-simplestreams', 'python-glanceclient',
12 'python-yaml', 'python-keystoneclient',

Subscribers

People subscribed via source and target branches

to all changes: