equal
deleted
inserted
replaced
300 res_source_key = local |
300 res_source_key = local |
301 |
301 |
302 ignore_packages = [] |
302 ignore_packages = [] |
303 |
303 |
304 if system_str == 'Windows': |
304 if system_str == 'Windows': |
305 default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None} |
305 default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': {}} |
306 else: |
306 else: |
307 default_install_options = {'method': 'pip', 'option_str': None, 'dict_extra_env': None} |
307 default_install_options = {'method': 'pip', 'option_str': None, 'dict_extra_env': {}} |
308 |
308 |
309 if options.ignore_packages : |
309 if options.ignore_packages : |
310 ignore_packages = options.ignore_packages.split(",") |
310 ignore_packages = options.ignore_packages.split(",") |
311 |
311 |
312 logger.indent += 2 |
312 logger.indent += 2 |
318 if install_options is None: |
318 if install_options is None: |
319 install_options = default_install_options |
319 install_options = default_install_options |
320 method = install_options.get('method', default_install_options['method']) |
320 method = install_options.get('method', default_install_options['method']) |
321 option_str = install_options.get('option_str', default_install_options['option_str']) |
321 option_str = install_options.get('option_str', default_install_options['option_str']) |
322 extra_env = install_options.get('dict_extra_env', default_install_options['dict_extra_env']) |
322 extra_env = install_options.get('dict_extra_env', default_install_options['dict_extra_env']) |
|
323 if not extra_env: |
|
324 extra_env = {} |
|
325 |
323 if 'TMPDIR' not in extra_env: |
326 if 'TMPDIR' not in extra_env: |
324 extra_env['TMPDIR'] = os.path.abspath(tmp_dir) |
327 extra_env['TMPDIR'] = os.path.abspath(tmp_dir) |
325 #isinstance(lst, (list, tuple)) |
328 #isinstance(lst, (list, tuple)) |
326 if key not in ignore_packages: |
329 if key not in ignore_packages: |
327 if callable(method): |
330 if callable(method): |