Merge lp:~frankban/charms/oneiric/buildbot-master/apt-sources into lp:~yellow/charms/oneiric/buildbot-master/trunk

Proposed by Francesco Banconi on 2012-04-16
Status: Merged
Approved by: Gary Poster on 2012-04-16
Approved revision: 42
Merged at revision: 42
Proposed branch: lp:~frankban/charms/oneiric/buildbot-master/apt-sources
Merge into: lp:~yellow/charms/oneiric/buildbot-master/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
hooks/install (+2/-0)
To merge this branch: bzr merge lp:~frankban/charms/oneiric/buildbot-master/apt-sources
Reviewer Review Type Date Requested Status
Gary Poster (community) 2012-04-16 Approve on 2012-04-16
Review via email: mp+102075@code.launchpad.net

Description of the change

== Changes ==

APT sources replacement is installed only if apt-get update return code is 100.

To post a comment you must log in.
Gary Poster (gary) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2012-04-05 15:25:12 +0000
3+++ hooks/install 2012-04-16 09:28:26 +0000
4@@ -107,6 +107,8 @@
5 except subprocess.CalledProcessError as e:
6 log("Error running 'apt-get update':")
7 log(str(e))
8+ if e.returncode != 100:
9+ raise
10 log("Proceeding with re-written /etc/apt/sources.list")
11 fix_apt_sources()
12 run('apt-get', 'update')

Subscribers

People subscribed via source and target branches