Juju Charms Collection
summit package

Merge lp:~cjohnston/charms/precise/summit/trunk into lp:~mark-mims/charms/precise/summit/trunk

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into trunk
Proposed by Chris Johnston
Status: Needs review
Proposed branch: lp:~cjohnston/charms/precise/summit/trunk
Merge into: lp:~mark-mims/charms/precise/summit/trunk
Diff against target: 34 lines (+4/-4)
1 file modified
hooks/install (+4/-4)
To merge this branch: bzr merge lp:~cjohnston/charms/precise/summit/trunk
Reviewer Review Type Date Requested Status
Mark Mims Pending
Review via email: mp+142439@code.launchpad.net

Description of the change

Updates python for precise

To post a comment you must log in.
lp:~cjohnston/charms/precise/summit/trunk updated
46. By Chris Johnston

more fixes

Unmerged revisions

46. By Chris Johnston

more fixes

45. By Chris Johnston

Updates python for precise

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2012-09-26 15:37:29 +0000
3+++ hooks/install 2013-01-09 06:11:21 +0000
4@@ -5,10 +5,10 @@
5
6 # We want to use the vcsrepo resource type, and it seems the
7 # best way to install that is via the puppet-module tool.
8-apt-get -y install puppet pwgen
9+apt-get install -y puppet pwgen
10 # Default vcsrepo 0.0.4 suffers from http://projects.puppetlabs.com/issues/9083
11 # (I've commented on and re-opened the above bug.
12-apt-get -y install rubygems
13+apt-get install -y rubygems
14 gem install puppet-module
15 puppet-module install puppetlabs-vcsrepo --version=0.0.3 --force
16 rm -rf /etc/puppet/modules/vcsrepo/
17@@ -29,7 +29,7 @@
18 # for both apt and pip resource types.
19 if [ "$additional_debian_packages" ]; then
20 juju-log "Installing extra debian packages: $additional_debian_packages"
21- sudo apt-get -y install $additional_debian_packages
22+ sudo apt-get install -y $additional_debian_packages
23 fi
24 if [ "$additional_pip_packages" ]; then
25 juju-log "Installing extra pip packages: $additional_pip_packages"
26@@ -58,7 +58,7 @@
27 local source_dir="/srv/$service_hostname"
28 pip install -r $source_dir/requirements.txt
29 #python2.6 /usr/bin/pip install -r $source_dir/requirements.txt
30- apt-get install python2.6 python2.6-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes python-django python-django-openid-auth python-django-south python-beautifulsoup python-psycopg2 python-openid python-tz python-simplejson python-memcache
31+ apt-get install -y python python-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes python-django python-django-openid-auth python-django-south python-beautifulsoup python-psycopg2 python-openid python-tz python-simplejson python-memcache
32 }
33 pip_install
34 #MMM idempotency?

Subscribers

People subscribed via source and target branches

to all changes: