Skip to content

Commit

Permalink
do not crash if autocmake.yml does not contain any modules
Browse files Browse the repository at this point in the history
  • Loading branch information
bast committed Jul 18, 2016
1 parent 003cff2 commit 6353a2e
Showing 1 changed file with 50 additions and 50 deletions.
100 changes: 50 additions & 50 deletions update.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,57 +57,57 @@ def fetch_modules(config, relative_path, download_directory):
total=num_sources,
width=30)

i = 0
for t in config['modules']:
for k, v in t.items():

d = to_d(v)
for _k, _v in to_d(v).items():
cleaned_config[_k] = flat_add(cleaned_config[_k], _v)

# fetch sources and parse them
if 'source' in d:
for src in to_l(d['source']):
i += 1

# we download the file
module_name = os.path.basename(src)
if 'http' in src:
path = download_directory
name = 'autocmake_{0}'.format(module_name)
dst = os.path.join(download_directory, 'autocmake_{0}'.format(module_name))
fetch_url(src, dst)
file_name = dst
fetch_dst_directory = download_directory
else:
if os.path.exists(src):
path = os.path.dirname(src)
name = module_name
file_name = src
fetch_dst_directory = path
if 'modules' in config:
i = 0
for t in config['modules']:
for k, v in t.items():

d = to_d(v)
for _k, _v in to_d(v).items():
cleaned_config[_k] = flat_add(cleaned_config[_k], _v)

# fetch sources and parse them
if 'source' in d:
for src in to_l(d['source']):
i += 1

# we download the file
module_name = os.path.basename(src)
if 'http' in src:
path = download_directory
name = 'autocmake_{0}'.format(module_name)
dst = os.path.join(download_directory, 'autocmake_{0}'.format(module_name))
fetch_url(src, dst)
file_name = dst
fetch_dst_directory = download_directory
else:
sys.stderr.write("ERROR: {0} does not exist\n".format(src))
sys.exit(-1)

# we infer config from the module documentation
# dictionary d overrides the configuration in the module documentation
# this allows to override interpolation inside the module
with open(file_name, 'r') as f:
parsed_config = parse_cmake_module(f.read(), d)
for _k2, _v2 in parsed_config.items():
if _k2 not in to_d(v):
# we add to clean_config only if the entry does not exist
# in parent autocmake.yml already
# this allows to override
cleaned_config[_k2] = flat_add(cleaned_config[_k2], _v2)

modules.append(Module(path=path, name=name))
print_progress_bar(text='- assembling modules:',
done=i,
total=num_sources,
width=30)

print('')
if os.path.exists(src):
path = os.path.dirname(src)
name = module_name
file_name = src
fetch_dst_directory = path
else:
sys.stderr.write("ERROR: {0} does not exist\n".format(src))
sys.exit(-1)

# we infer config from the module documentation
# dictionary d overrides the configuration in the module documentation
# this allows to override interpolation inside the module
with open(file_name, 'r') as f:
parsed_config = parse_cmake_module(f.read(), d)
for _k2, _v2 in parsed_config.items():
if _k2 not in to_d(v):
# we add to clean_config only if the entry does not exist
# in parent autocmake.yml already
# this allows to override
cleaned_config[_k2] = flat_add(cleaned_config[_k2], _v2)

modules.append(Module(path=path, name=name))
print_progress_bar(text='- assembling modules:',
done=i,
total=num_sources,
width=30)
print('')

return modules, cleaned_config

Expand Down

0 comments on commit 6353a2e

Please sign in to comment.