Download as
Browse Code »

Commit 74911e80ce244e46f61a48d824a59aaf1b1ad24d

Authored by Sergio Oliveira
1 parent 653292a1
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Install pkg_resource before using it

Showing 1 changed file with 8 additions and 4 deletions   Show diff stats
puppet/bootstrap.py
  Diff comments   View file @74911e8
... ... @@ -8,9 +8,16 @@ import subprocess
8 8 import urllib
9 9  
10 10 from distutils.version import StrictVersion
11   -from pkg_resources import parse_requirements
12 11 from shutil import copyfile
13 12  
  13 +try:
  14 + from pkg_resources import parse_requirements
  15 +except ImportError:
  16 + # Needed dependency for import pkg_resources
  17 + pkg_res = ['apt-get', 'install', 'python-pkg-resources', '-y']
  18 + subprocess.call(pkg_res)
  19 + from pkg_resources import parse_requirements
  20 +
14 21 PUPPET_TARGET_VERSION = "3.6.2"
15 22 PUPPET_DIR = os.path.join(os.path.dirname(__file__))
16 23 MODULES_FILE_PATH = os.path.join(PUPPET_DIR, 'modules.txt')
... ... @@ -129,9 +136,6 @@ def main():
129 136 update = ['apt-get', 'update', '-y']
130 137 install = ['apt-get', 'install', 'puppet', '-y']
131 138  
132   - # Needed dependency for import pkg_resources
133   - pkg_res = ['apt-get', 'install', 'python-pkg-resources', '-y']
134   - subprocess.call(pkg_res)
135 139 else:
136 140 print('This distribuition is currently not supported!')
137 141 print('exiting...')
... ...