Gavin Panella has proposed merging lp:~allenap/maas/update-buildout-etc-simple into lp:maas.
Commit message: Make offline building more reliable, turn off "newest" in buildout, and update to Quantal's version of Pygments. Previously some parts of the build were still making HTTP connections even when "offline" was set. Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~allenap/maas/update-buildout-etc-simple/+merge/128140 -- https://code.launchpad.net/~allenap/maas/update-buildout-etc-simple/+merge/128140 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/update-buildout-etc-simple into lp:maas.
=== modified file 'Makefile' --- Makefile 2012-09-27 22:11:29 +0000 +++ Makefile 2012-10-04 23:34:24 +0000 @@ -10,6 +10,13 @@ virtualenv := virtualenv --never-download endif +# If offline has been selected, attempt to further block HTTP/HTTPS +# activity by setting bogus proxies in the environment. +ifneq ($(offline),) +export http_proxy := broken +export https_proxy := broken +endif + # Python enum modules. py_enums := $(wildcard src/*/enum.py) # JavaScript enum module (not modules). === modified file 'buildout.cfg' --- buildout.cfg 2012-09-27 02:51:21 +0000 +++ buildout.cfg 2012-10-04 23:34:24 +0000 @@ -16,6 +16,7 @@ versions = versions extends = versions.cfg offline = false +newest = false # Since MAAS's main deployment target is Ubuntu, all runtime # dependencies should come from python packages. However, it's okay === modified file 'versions.cfg' --- versions.cfg 2012-09-24 11:20:38 +0000 +++ versions.cfg 2012-10-04 23:34:24 +0000 @@ -7,7 +7,7 @@ # Versions in Precise docutils = 0.8.1 Jinja2 = 2.6 -Pygments = 1.4 +Pygments = 1.5 Sphinx = 1.1.3 [versions-dev]
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
