Merge lp:~hatch/charms/precise/juju-gui/revert-node into lp:~juju-gui/charms/precise/juju-gui/trunk

[Jeff Pihach]

Reverted Node.js version back to 0.8.x

This is required because of a spritegen error which
happens when we try to deploy the charm.

https://codereview.appspot.com/8631048/

[Jeff Pihach (hatch)]

Reviewers: mp+160952_code.launchpad.net,

Message:
Please take a look.

Description:
Reverted Node.js version back to 0.8.x

This is required because of a spritegen error which
happens when we try to deploy the charm.

https://code.launchpad.net/~hatch/charms/precise/juju-gui/revert-node/+merge/160952

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M hooks/utils.py

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: hooks/utils.py
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2013-04-24 10:46:20 +0000
+++ hooks/utils.py 2013-04-25 16:46:07 +0000
@@ -84,9 +84,9 @@
  JUJU_GUI_SITE = '/etc/apache2/sites-available/juju-gui'
  JUJU_GUI_PORTS = '/etc/apache2/ports.conf'
  JUJU_PEM = 'juju.includes-private-key.pem'
-BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
+BUILD_REPOSITORIES = ('ppa:chris-lea/node.js-legacy',)
  DEB_BUILD_DEPENDENCIES = (
- 'bzr', 'imagemagick', 'make', 'nodejs',
+ 'bzr', 'imagemagick', 'make', 'nodejs', 'npm',
  )
  DEB_STAGE_DEPENDENCIES = (
      'zookeeper',

[Gary Poster (gary)]

LGTM thank you. Please make sure you QA :-)

https://codereview.appspot.com/8631048/

[Benjamin Saller (bcsaller)]

LGTM thanks

https://codereview.appspot.com/8631048/

[Jeff Pihach (hatch)]

*** Submitted:

Reverted Node.js version back to 0.8.x

This is required because of a spritegen error which
happens when we try to deploy the charm.

R=gary.poster, bcsaller
CC=
https://codereview.appspot.com/8631048

https://codereview.appspot.com/8631048/

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2013-04-24 10:46:20 +0000
+++ hooks/utils.py	2013-04-25 16:48:26 +0000
@@ -84,9 +84,9 @@
 JUJU_GUI_SITE = '/etc/apache2/sites-available/juju-gui'
 JUJU_GUI_PORTS = '/etc/apache2/ports.conf'
 JUJU_PEM = 'juju.includes-private-key.pem'
-BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
+BUILD_REPOSITORIES = ('ppa:chris-lea/node.js-legacy',)
 DEB_BUILD_DEPENDENCIES = (
-    'bzr', 'imagemagick', 'make',  'nodejs',
+    'bzr', 'imagemagick', 'make',  'nodejs', 'npm',
 )
 DEB_STAGE_DEPENDENCIES = (
     'zookeeper',