diff options
| -rwxr-xr-x | migrations/008-submodules-in-strata.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/migrations/008-submodules-in-strata.py b/migrations/008-submodules-in-strata.py index a536852..33404f2 100755 --- a/migrations/008-submodules-in-strata.py +++ b/migrations/008-submodules-in-strata.py @@ -36,11 +36,9 @@ import requests import string import logging import re -import os import sys import warnings import migrations -from subprocess import call, Popen from ConfigParser import RawConfigParser from StringIO import StringIO @@ -60,7 +58,7 @@ GIT_CACHE_SERVER_URL = 'http://%s:8080/' % TROVE_HOST FAIL_ON_REMOTE_CACHE_ERRORS = False -TO_VERSION = 8 +TO_VERSION = 8 # From ybd.git file repos.py at commit eb3bf397ba729387f0d4145a8df8d3c1f9eb707f @@ -170,12 +168,12 @@ def submodules_to_dict(url, ref): parser.readfp(io) stuff = {} for section in parser.sections(): - submodule = re.sub(r'submodule "(.*)"', r'\1', section) - url = parser.get(section, 'url') - path = parser.get(section, 'path') - stuff[submodule] = {'url': url} + submodule = re.sub(r'submodule "(.*)"', r'\1', section) + url = parser.get(section, 'url') + stuff[submodule] = {'url': url} return stuff + def add_submodules_to_strata(contents, filename): assert contents['kind'] == 'stratum' @@ -202,12 +200,11 @@ def add_submodules_to_strata(contents, filename): else: warnings.warn(message) warnings.warn(warning) - continue + continue logging.debug( "%s: got file list %s", chunk_git_url, toplevel_file_list) - path = get_repo_name(chunk_git_url) if u'.gitmodules' in toplevel_file_list: submodules = submodules_to_dict(chunk_git_url, chunk_git_ref) if submodules: |