~landscape/charms/trusty/rabbitmq-server-backport-lp1500204/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/utils.py

[beisner,r=james-page] auto normalize amulet test definitions and amulet make targets; charm-helper sync.

Show diffs side-by-side

added added

removed removed

Lines of Context:
524
524
    projects = yaml.load(projects_yaml)
525
525
    _git_validate_projects_yaml(projects, core_project)
526
526
 
 
527
    old_environ = dict(os.environ)
 
528
 
527
529
    if 'http_proxy' in projects.keys():
528
530
        os.environ['http_proxy'] = projects['http_proxy']
529
 
 
530
531
    if 'https_proxy' in projects.keys():
531
532
        os.environ['https_proxy'] = projects['https_proxy']
532
533
 
544
545
            repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
545
546
                                                     update_requirements=True)
546
547
 
 
548
    os.environ = old_environ
 
549
 
547
550
 
548
551
def _git_validate_projects_yaml(projects, core_project):
549
552
    """