Merge lp:~frankban/charms/precise/juju-gui/remove-npm into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

Fix GUI charm broken by npm update.

https://codereview.appspot.com/67990044/

[Francesco Banconi (frankban)]

Reviewers: mp+208842_code.launchpad.net,

Message:
Please take a look.

Description:
Fix GUI charm broken by npm update.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/remove-npm/+merge/208842

(do not edit description out of merge proposal)

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

Affected files (+6, -3 lines):
   A [revision details]
   M hooks/utils.py
   M revision

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 2014-02-21 10:24:19 +0000
+++ revision 2014-02-28 13:07:33 +0000
@@ -1,1 +1,1 @@
-106
+107

Index: hooks/utils.py
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2014-02-04 20:07:31 +0000
+++ hooks/utils.py 2014-02-28 15:33:29 +0000
@@ -114,7 +114,7 @@

  JUJU_PEM = 'juju.includes-private-key.pem'
  DEB_BUILD_DEPENDENCIES = (
- 'bzr', 'g++', 'git', 'imagemagick', 'make', 'nodejs', 'npm',
+ 'bzr', 'g++', 'git', 'imagemagick', 'make', 'nodejs',
  )

@@ -628,8 +628,9 @@
      fd, name = tempfile.mkstemp(prefix='make-distfile-', dir=logdir)
      log('Output from "make distfile" sent to %s' % name)

+ # Passing HOME is required by node during npm packages installation.
      run('make', '-C',
juju_gui_source_dir, 'distfile', 'BRANCH_IS_GOOD=true',
- stdout=fd, stderr=fd)
+ 'HOME={}'.format(os.path.expanduser('~')), stdout=fd, stderr=fd)

      return first_path_in_dir(
          os.path.join(juju_gui_source_dir, 'releases'))

[Richard Harding (rharding)]

LGTM thanks for the quick diagnosis and update.

https://codereview.appspot.com/67990044/

[Francesco Banconi (frankban)]

*** Submitted:

Fix GUI charm broken by npm update.

R=rharding
CC=
https://codereview.appspot.com/67990044

https://codereview.appspot.com/67990044/

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-02-04 20:07:31 +0000
+++ hooks/utils.py	2014-02-28 15:36:03 +0000
@@ -114,7 +114,7 @@
 
 JUJU_PEM = 'juju.includes-private-key.pem'
 DEB_BUILD_DEPENDENCIES = (
-    'bzr', 'g++', 'git', 'imagemagick', 'make',  'nodejs', 'npm',
+    'bzr', 'g++', 'git', 'imagemagick', 'make',  'nodejs',
 )
 
 
@@ -628,8 +628,9 @@
     fd, name = tempfile.mkstemp(prefix='make-distfile-', dir=logdir)
     log('Output from "make distfile" sent to %s' % name)
 
+    # Passing HOME is required by node during npm packages installation.
     run('make', '-C', juju_gui_source_dir, 'distfile', 'BRANCH_IS_GOOD=true',
-        stdout=fd, stderr=fd)
+        'HOME={}'.format(os.path.expanduser('~')), stdout=fd, stderr=fd)
 
     return first_path_in_dir(
         os.path.join(juju_gui_source_dir, 'releases'))

=== modified file 'revision'
--- revision	2014-02-21 10:24:19 +0000
+++ revision	2014-02-28 15:36:03 +0000
@@ -1,1 +1,1 @@
-106
+107