sb: VERSION may not contain a release path or hashes

This commit is contained in:
Chris Johns 2019-12-05 16:27:10 +11:00
parent c11d142f95
commit ad5d3afea9

View File

@ -705,14 +705,14 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc', logfile = Tru
# #
def setting_error(msg): def setting_error(msg):
raise error.general(msg) raise error.general(msg)
hashes = version.load_release_settings('hashes', error = setting_error) hashes = version.load_release_settings('hashes')
for hash in hashes: for hash in hashes:
hs = hash[1].split() hs = hash[1].split()
if len(hs) != 2: if len(hs) != 2:
raise error.general('invalid release hash in VERSION') raise error.general('invalid release hash in VERSION')
sources.hash((hs[0], hash[0], hs[1]), o.defaults, setting_error) sources.hash((hs[0], hash[0], hs[1]), o.defaults, setting_error)
release_path = version.load_release_setting('version', 'release_path', release_path = version.load_release_setting('version', 'release_path',
raw = True, error = setting_error) raw = True)
if release_path is not None: if release_path is not None:
try: try:
release_path = ','.join([rp.strip() for rp in release_path.split(',')]) release_path = ','.join([rp.strip() for rp in release_path.split(',')])