~charmers/charms/precise/buildbot-master/trunk

« back to all changes in this revision

Viewing changes to hooks/install

  • Committer: Brad Crittenden
  • Date: 2012-02-07 12:35:06 UTC
  • mto: (11.1.7 dynamic-relationship)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: bac@canonical.com-20120207123506-y3qeme4bu8ckp8zs
Code clean up.  Problems noted in review of the buildbot-slave.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
 
 
3
# Copyright 2012 Canonical Ltd.  This software is licensed under the
 
4
# GNU Affero General Public License version 3 (see the file LICENSE).
 
5
 
3
6
import os
4
7
import shutil
5
8
from subprocess import CalledProcessError
19
22
 
20
23
 
21
24
def bootstrap(buildbot_dir):
22
 
    apt_get_install('sharutils', 'bzr')
 
25
    apt_get_install('bzr')
23
26
    # Since we may be installing into a pre-existing service, ensure the
24
27
    # buildbot directory is removed.
25
28
    if os.path.exists(buildbot_dir):