Merge lp:~bac/charms/precise/juju-gui/trunk into lp:~juju-gui/charms/precise/juju-gui/trunk

[Brad Crittenden]

Ensure JUJU_ENV is set when required.

https://codereview.appspot.com/24790045/

[Brad Crittenden (bac)]

Reviewers: mp+194896_code.launchpad.net,

Message:
Please take a look.

Description:
Ensure JUJU_ENV is set when required.

https://code.launchpad.net/~bac/charms/precise/juju-gui/trunk/+merge/194896

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/24790045/

Affected files (+12, -5 lines):
   M Makefile
   A [revision details]
   M revision

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2013-10-01 20:53:38 +0000
+++ Makefile 2013-11-12 16:38:27 +0000
@@ -31,9 +31,14 @@
   ./tests/10-unit.test
   ./tests/11-server.test

-ensure-juju-test:
+ensure-juju-env:
+ifndef JUJU_ENV
+ $(error JUJU_ENV must be set. See HACKING.md)
+endif
+
+ensure-juju-test: ensure-juju-env
   @which juju-test > /dev/null \
- || (echo 'The "juju-test" command is missing. See HACKING.md.' \
+ || (echo 'The "juju-test" command is missing. See HACKING.md' \
    ; false)

  ftest: setup ensure-juju-test
@@ -73,5 +78,5 @@
   @echo ' service to be started. If JUJU_ENV is not passed, the charm
will'
   @echo ' be deployed in the default Juju environment.'

-.PHONY: all clean deploy ensure-juju-test ftest help jujutest lint setup
test \
- unittest
+.PHONY: all clean deploy ensure-juju-test ensure-juju-env ftest help \
+ jujutest lint setup test unittest

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: revision
=== modified file 'revision'
--- revision 2013-11-07 20:03:46 +0000
+++ revision 2013-11-12 16:39:09 +0000
@@ -1,1 +1,1 @@
-95
+96

[Jeff Pihach (hatch)]

LGTM Thanks for this!

https://codereview.appspot.com/24790045/

[Brad Crittenden (bac)]

*** Submitted:

Ensure JUJU_ENV is set when required.

R=jeff.pihach
CC=
https://codereview.appspot.com/24790045

https://codereview.appspot.com/24790045/

=== modified file 'Makefile'
--- Makefile	2013-10-01 20:53:38 +0000
+++ Makefile	2013-11-12 16:44:01 +0000
@@ -31,9 +31,14 @@
 	./tests/10-unit.test
 	./tests/11-server.test
 
-ensure-juju-test:
+ensure-juju-env:
+ifndef JUJU_ENV
+	$(error JUJU_ENV must be set.  See HACKING.md)
+endif
+
+ensure-juju-test: ensure-juju-env
 	@which juju-test > /dev/null \
-		|| (echo 'The "juju-test" command is missing.  See HACKING.md.' \
+		|| (echo 'The "juju-test" command is missing.  See HACKING.md' \
 		; false)
 
 ftest: setup ensure-juju-test
@@ -73,5 +78,5 @@
 	@echo '  service to be started.  If JUJU_ENV is not passed, the charm will'
 	@echo '  be deployed in the default Juju environment.'
 
-.PHONY: all clean deploy ensure-juju-test ftest help jujutest lint setup test \
-    unittest
+.PHONY: all clean deploy ensure-juju-test ensure-juju-env ftest help \
+    jujutest lint setup test unittest

=== modified file 'revision'
--- revision	2013-11-07 20:03:46 +0000
+++ revision	2013-11-12 16:44:01 +0000
@@ -1,1 +1,1 @@
-95
+96