force six install directly in the install hook

This commit is contained in:
Ryan Beisner 2014-12-17 17:24:16 +00:00
parent 3610c7d684
commit 556c84afc5
2 changed files with 4 additions and 2 deletions

View File

@ -61,6 +61,7 @@ def install():
src = 'cloud:precise-folsom'
configure_installation_source(src)
apt_update(fatal=True)
apt_install('python-six', fatal=True)
if valid_plugin():
apt_install(filter_installed_packages(get_early_packages()),
fatal=True)

View File

@ -156,12 +156,13 @@ def get_early_packages():
if config('plugin') in [OVS]:
pkgs = determine_dkms_package()
else:
return ['python-six']
return []
# return ['python-six']
# ensure headers are installed build any required dkms packages
if [p for p in pkgs if 'dkms' in p]:
return pkgs + [headers_package()]
pkgs.append('python-six')
# pkgs.append('python-six')
return pkgs