launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/install-dependencies-tweak into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/install-dependencies-tweak/+merge/117288

>From the revision history:

* Depend on apache2, not apache2-mpm-prefork, as it's not required for
  Django any more.

* Move install_dependencies towards to the top of the Makefile, make
  it display the full command line when executing, rename it
  install-dependencies to match a couple of existing targets, and mark
  it as phony.

* Change make to a dev dependency.

-- 
https://code.launchpad.net/~allenap/maas/install-dependencies-tweak/+merge/117288
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/install-dependencies-tweak into lp:maas.

=== modified file 'Makefile'
--- Makefile	2012-07-30 03:05:15 +0000
+++ Makefile	2012-07-30 16:06:23 +0000
@@ -34,6 +34,11 @@
 
 all: build doc
 
+# Install all packages required for MAAS development & operation on
+# the system. This may prompt for a password.
+install-dependencies:
+	sudo apt-get install $(shell sort -u required-packages/*)
+
 bin/python bin/pip:
 	$(virtualenv) --python=$(python) --system-site-packages $(CURDIR)
 
@@ -159,6 +164,7 @@
   doc
   enums
   harness
+  install-dependencies
   lint
   lint-css
   lint-js
@@ -192,12 +198,6 @@
 
 supervise: $(addsuffix @supervise,$(services))
 
-# Install all packages required for MAAS development & operation on the
-# system.
-# This may prompt for a password.
-install_dependencies:
-	sudo apt-get install `cat required-packages/*`
-
 define phony_services_targets
   pause
   restart

=== modified file 'required-packages/base'
--- required-packages/base	2012-07-30 03:11:00 +0000
+++ required-packages/base	2012-07-30 16:06:23 +0000
@@ -1,4 +1,4 @@
-apache2-mpm-prefork
+apache2
 avahi-daemon
 bind9
 bind9utils
@@ -7,7 +7,6 @@
 dnsutils
 isc-dhcp-common
 libpq-dev
-make
 postgresql-9.1
 python-amqplib
 python-avahi

=== modified file 'required-packages/dev'
--- required-packages/dev	2012-07-30 03:30:35 +0000
+++ required-packages/dev	2012-07-30 16:06:23 +0000
@@ -1,6 +1,7 @@
 avahi-utils
 curl
 firefox
+make
 python-lxml
 python-pip
 python-pocket-lint