~james-page/charms/precise/cinder/whitelist-blocks

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/fetch/__init__.py

  • Committer: James Page
  • Date: 2014-03-06 12:33:03 UTC
  • Revision ID: james.page@canonical.com-20140306123303-afalkmxbixn1jfhe
Switch to upgrade on openstack upgrade

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
        subprocess.call(cmd, env=env)
98
98
 
99
99
 
 
100
def apt_upgrade(options=None, fatal=False):
 
101
    """Install one or more packages"""
 
102
    if options is None:
 
103
        options = ['--option=Dpkg::Options::=--force-confold']
 
104
 
 
105
    cmd = ['apt-get', '--assume-yes']
 
106
    cmd.extend(options)
 
107
    cmd.append('upgrade')
 
108
    log("Upgrading with options: {}".format(options))
 
109
 
 
110
    env = os.environ.copy()
 
111
    if 'DEBIAN_FRONTEND' not in env:
 
112
        env['DEBIAN_FRONTEND'] = 'noninteractive'
 
113
 
 
114
    if fatal:
 
115
        subprocess.check_call(cmd, env=env)
 
116
    else:
 
117
        subprocess.call(cmd, env=env)
 
118
 
 
119
 
100
120
def apt_update(fatal=False):
101
121
    """Update local apt cache"""
102
122
    cmd = ['apt-get', 'update']