launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/offline-more into lp:maas.

Commit message:
make offline=true <target> now keeps buildout and virtualenv off the network for all targets.

Previously there was a build-offline target that permitted an offline build only. This is a more general solution.


Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~allenap/maas/offline-more/+merge/126045
-- 
https://code.launchpad.net/~allenap/maas/offline-more/+merge/126045
Your team MAAS Maintainers is requested to review the proposed merge of lp:~allenap/maas/offline-more into lp:maas.

=== modified file 'Makefile'
--- Makefile	2012-09-21 14:58:20 +0000
+++ Makefile	2012-09-24 16:15:25 +0000
@@ -1,6 +1,14 @@
 python := python2.7
+
+# Network activity can be suppressed by setting offline=true (or any
+# non-empty string) at the command-line.
+ifeq ($(offline),)
 buildout := bin/buildout
 virtualenv := virtualenv
+else
+buildout := bin/buildout buildout:offline=true
+virtualenv := virtualenv --never-download
+endif
 
 # Python enum modules.
 py_enums := $(wildcard src/*/enum.py)
@@ -27,13 +35,6 @@
     bin/py bin/ipy \
     $(js_enums)
 
-# Note: the following target may not be needed. It remains as an
-# experiment, to see if it helps the situation with building MAAS in
-# the QA environment, which is isolated from the Internet at large.
-build-offline: buildout := $(buildout) buildout:offline=true
-build-offline: virtualenv := $(virtualenv) --never-download
-build-offline: build
-
 all: build doc
 
 # Install all packages required for MAAS development & operation on
@@ -170,7 +171,6 @@
 
 define phony_targets
   build
-  build-offline
   check
   clean
   dbharness