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

[Jeff Pihach]

Change to legacy node.js PPA to revert to 0.8

https://codereview.appspot.com/7759050/

[Jeff Pihach (hatch)]

Reviewers: mp+153617_code.launchpad.net,

Message:
Please take a look.

Description:
Change to legacy node.js PPA to revert to 0.8

https://code.launchpad.net/~hatch/charms/precise/juju-gui/conflict/+merge/153617

(do not edit description out of merge proposal)

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

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-03-13 21:24:31 +0000
+++ hooks/utils.py 2013-03-15 17:31:24 +0000
@@ -76,7 +76,8 @@
  JUJU_GUI_DIR = os.path.join(CURRENT_DIR, 'juju-gui')
  JUJU_GUI_SITE = '/etc/nginx/sites-available/juju-gui'
  JUJU_PEM = 'juju.includes-private-key.pem'
-BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
+#BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
+BUILD_REPOSITORIES = ('ppa:chris-lea/node.js-legacy',)
  DEB_BUILD_DEPENDENCIES = (
      'bzr', 'imagemagick', 'make', 'nodejs', 'npm',
  )

[Brad Crittenden (bac)]

LGTM with changes

https://codereview.appspot.com/7759050/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/7759050/diff/1/hooks/utils.py#newcode79
hooks/utils.py:79: #BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
Can the commented line. We've got version control!

https://codereview.appspot.com/7759050/

[Jeff Pihach (hatch)]

Thanks for the review!

https://codereview.appspot.com/7759050/diff/1/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/7759050/diff/1/hooks/utils.py#newcode79
hooks/utils.py:79: #BUILD_REPOSITORIES = ('ppa:chris-lea/node.js',)
On 2013/03/15 19:35:05, bac wrote:
> Can the commented line. We've got version control!
Gone!

https://codereview.appspot.com/7759050/

[lp:~hatch/charms/precise/juju-gui/conflict]

38. By Jeff Pihach on 2013-03-15

removed commented out line

[Jeff Pihach (hatch)]

*** Submitted:

Change to legacy node.js PPA to revert to 0.8

R=bac
CC=
https://codereview.appspot.com/7759050

https://codereview.appspot.com/7759050/

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2013-03-13 21:24:31 +0000
+++ hooks/utils.py	2013-03-15 19:39:21 +0000
@@ -76,7 +76,7 @@
 JUJU_GUI_DIR = os.path.join(CURRENT_DIR, 'juju-gui')
 JUJU_GUI_SITE = '/etc/nginx/sites-available/juju-gui'
 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', 'npm',
 )