launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/acceptance-update-before-install-make into lp:maas.

Commit message:
Make the installation of `make` in ephemeral LXC environments more robust within the acceptance suite.

`make` may fail to install because the package lists are out of date, so update them and try again.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~allenap/maas/acceptance-update-before-install-make/+merge/144987

In the acceptance suite, the installation of `make` may fail in
ephemeral environments because the package lists are out of date, so
update them and try again.

-- 
https://code.launchpad.net/~allenap/maas/acceptance-update-before-install-make/+merge/144987
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/maas/acceptance-update-before-install-make into lp:maas.

=== modified file 'acceptance/with-make'
--- acceptance/with-make	2012-09-18 19:22:12 +0000
+++ acceptance/with-make	2013-01-25 17:04:25 +0000
@@ -8,6 +8,12 @@
 set -o nounset
 
 # Ensure that GNU make is installed.
-sudo -AE apt-get install --assume-yes make
+if ! sudo -AE apt-get install --assume-yes make
+then
+    # The installation of `make` may have failed because the package
+    # lists are out of date, so update them and try again.
+    sudo -AE apt-get update
+    sudo -AE apt-get install --assume-yes make
+fi
 
 exec "$@"