yellow team mailing list archive

[Francesco Banconi <frankban@xxxxxxxxx>]

Francesco Banconi has proposed merging lp:~frankban/charms/oneiric/buildbot-slave/apt-sources into lp:~yellow/charms/oneiric/buildbot-slave/trunk.

Requested reviews:
  Launchpad Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~frankban/charms/oneiric/buildbot-slave/apt-sources/+merge/102074

== Changes ==

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

-- 
https://code.launchpad.net/~frankban/charms/oneiric/buildbot-slave/apt-sources/+merge/102074
Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~frankban/charms/oneiric/buildbot-slave/apt-sources into lp:~yellow/charms/oneiric/buildbot-slave/trunk.

=== modified file 'hooks/install'
--- hooks/install	2012-04-05 17:01:11 +0000
+++ hooks/install	2012-04-16 09:28:23 +0000
@@ -110,6 +110,8 @@
     except subprocess.CalledProcessError as e:
         log("Error running 'apt-get update':")
         log(str(e))
+        if e.returncode != 100:
+            raise
         log("Proceeding with re-written /etc/apt/sources.list")
         fix_apt_sources()
         run('apt-get', 'update')