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

Proposed by Jeff Pihach
Status: Merged
Merged at revision: 47
Proposed branch: lp:~hatch/charms/precise/juju-gui/revert-node
Merge into: lp:~juju-gui/charms/precise/juju-gui/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
hooks/utils.py (+2/-2)
To merge this branch: bzr merge lp:~hatch/charms/precise/juju-gui/revert-node
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+160952@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Jeff Pihach (hatch) wrote :

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',

Revision history for this message
Gary Poster (gary) wrote :

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

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

Revision history for this message
Benjamin Saller (bcsaller) wrote :
Revision history for this message
Jeff Pihach (hatch) wrote :

*** 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/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/utils.py'
2--- hooks/utils.py 2013-04-24 10:46:20 +0000
3+++ hooks/utils.py 2013-04-25 16:48:26 +0000
4@@ -84,9 +84,9 @@
5 JUJU_GUI_SITE = '/etc/apache2/sites-available/juju-gui'
6 JUJU_GUI_PORTS = '/etc/apache2/ports.conf'
7 JUJU_PEM = 'juju.includes-private-key.pem'
8-BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
9+BUILD_REPOSITORIES = ('ppa:chris-lea/node.js-legacy',)
10 DEB_BUILD_DEPENDENCIES = (
11- 'bzr', 'imagemagick', 'make', 'nodejs',
12+ 'bzr', 'imagemagick', 'make', 'nodejs', 'npm',
13 )
14 DEB_STAGE_DEPENDENCIES = (
15 'zookeeper',

Subscribers

People subscribed via source and target branches

to all changes: