Juju Charm Tools

Merge lp:~jose/charm-tools/fix-1335340 into lp:charm-tools/1.4

  1. fix-1335340
  2. Merge into 1.4
Proposed by José Antonio Rey
Status: Merged
Merged at revision: 340
Proposed branch: lp:~jose/charm-tools/fix-1335340
Merge into: lp:charm-tools/1.4
Diff against target: 15 lines (+2/-2)
1 file modified
charmtools/generate.py (+2/-2)
To merge this branch: bzr merge lp:~jose/charm-tools/fix-1335340
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+225178@code.launchpad.net

Description of the change

I have fixed bug 1335340 and added the -y flag to the apt-get install and add-apt-repository (not apt-get update, please disregard the commit message, made a mistake there!)

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmtools/generate.py'
2--- charmtools/generate.py 2014-02-27 03:57:06 +0000
3+++ charmtools/generate.py 2014-07-01 15:38:26 +0000
4@@ -93,9 +93,9 @@
5 with open(os.path.join(charm_dir, 'tests', '00-setup'), 'w') as f:
6 f.write("""#!/bin/bash
7
8-sudo add-apt-repository ppa:juju/stable
9+sudo add-apt-repository ppa:juju/stable -y
10 sudo apt-get update
11-sudo apt-get install amulet
12+sudo apt-get install amulet -y
13 """)
14
15 os.chmod(os.path.join(charm_dir, 'tests', '00-autogen'), 0755)

Subscribers

People subscribed via source and target branches