Merge "Skip upstream check if we have already imported upstream"

This commit is contained in:
Jenkins 2016-06-08 18:38:29 +00:00 committed by Gerrit Code Review
commit 54a8d04860

@ -31,7 +31,7 @@ def tempdir():
reqroot = tempfile.mkdtemp()
yield reqroot
finally:
shutil.rmtree(reqroot)
shutil.rmtree(reqroot, ignore_errors=True)
def check_repo(repo_path):
@ -140,7 +140,15 @@ def main():
# but not git@
upstream = p.get('upstream')
if upstream and 'track-upstream' not in p.get('options', []):
found_errors += check_repo(upstream)
openstack_repo = 'https://git.openstack.org/%s' % name
try:
# Check to see if we have already imported the project into
# OpenStack, if so skip checking upstream.
check_repo(openstack_repo)
except git.exc.GitCommandError:
# We haven't imported the repo yet, make sure upstream is
# valid.
found_errors += check_repo(upstream)
if upstream:
for prefix in VALID_SCHEMES:
if upstream.startswith(prefix):