Juju Charms Collection
jenkins-slave package

Merge lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-indentation into lp:charms/jenkins-slave

  1. Precise Pangolin (12.04)
  2. jenkins-slave-fix-indentation
  3. Merge into trunk
Proposed by Timothy R. Chavez
Status: Merged
Merged at revision: 8
Proposed branch: lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-indentation
Merge into: lp:charms/jenkins-slave
Diff against target: 25 lines (+5/-5)
1 file modified
hooks/install (+5/-5)
To merge this branch: bzr merge lp:~timrchavez/charms/precise/jenkins-slave/jenkins-slave-fix-indentation
Reviewer Review Type Date Requested Status
Clint Byrum (community) Approve
Review via email: mp+103875@code.launchpad.net

Description of the change

Normalize the indentation in the install hook.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Looks great, thanks!

review: Approve

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 2011-09-22 08:51:30 +0000
3+++ hooks/install 2012-04-27 13:30:24 +0000
4@@ -4,17 +4,17 @@
5
6 install_slave () {
7 juju-log "Installing jenkins-slave..."
8- apt-get -y install python-software-properties
9- add-apt-repository ppa:hudson-ubuntu/testing
10- apt-get update || true
11- apt-get -y install -qq jenkins-slave
12+ apt-get -y install python-software-properties
13+ add-apt-repository ppa:hudson-ubuntu/testing
14+ apt-get update || true
15+ apt-get -y install -qq jenkins-slave
16 }
17 [[ -f /etc/init/jenkins-slave.conf ]] || install_slave
18
19 # Install some tools - can get set up deployment time
20 install_tools () {
21 juju-log "Installing tools..."
22- apt-get -y install -qq `config-get tools`
23+ apt-get -y install -qq `config-get tools`
24 }
25 install_tools
26

Subscribers

People subscribed via source and target branches

to all changes: