← Back to branch summary

~bac/charms/precise/juju-gui/released-changes

« back to all changes in this revision

Viewing changes to hooks/utils.py

  • Committer: Brad Crittenden
  • Date: 2013-06-04 16:15:29 UTC
  • mfrom: (60.2.1 juju-gui)
  • Revision ID: bac@canonical.com-20130604161529-92f0afos7a9e7q5b
Merge the changes that inadvertantly went directly to lp:charms/juju-gui.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/utils.py
59
59
    apt_get_install,
60
60
    command,
61
61
    environ,
62
 
    install_extra_repositories,
63
62
    run,
64
63
    script_name,
65
64
    search_file,
88
87
JUJU_GUI_SITE = '/etc/apache2/sites-available/juju-gui'
89
88
JUJU_GUI_PORTS = '/etc/apache2/ports.conf'
90
89
JUJU_PEM = 'juju.includes-private-key.pem'
91
 
BUILD_REPOSITORIES = ('ppa:chris-lea/node.js-legacy',)
92
90
DEB_BUILD_DEPENDENCIES = (
93
91
    'bzr', 'imagemagick', 'make',  'nodejs', 'npm',
94
92
)
111
109
def _get_build_dependencies():
112
110
    """Install deb dependencies for building."""
113
111
    log('Installing build dependencies.')
114
 
    cmd_log(install_extra_repositories(*BUILD_REPOSITORIES))
115
112
    cmd_log(apt_get_install(*DEB_BUILD_DEPENDENCIES))
116
113
 
117
114