Remove confusing else statement

The append_model() function in the generator.py file has a confusing else
statement. There is no need for setting
model['file_version'] = yaml_dict['file_version'] as entering the else
statement implies they are equal.

Change-Id: I5278677ac5890350dfac6d58cc8b04ff91f33849
This commit is contained in:
Jin Li 2017-11-03 15:32:55 -07:00
parent 27f386ab68
commit a0bffe14c0
1 changed files with 4 additions and 3 deletions

View File

@ -309,10 +309,11 @@ def append_model(model, yaml_dict):
file_version = yaml_dict.get('file_version')
cur_file_version = model.get('file_version')
if file_version and cur_file_version:
if file_version != file_version:
if file_version != cur_file_version:
raise_format_error('File version mismatch %s', (file_version))
else:
model['file_version'] = yaml_dict['file_version']
# no need to re-assign! entering else statement implies they are equal
# else:
# model['file_version'] = yaml_dict['file_version']
elif file_version:
model['file_version'] = file_version
if 'imports' in yaml_dict: