summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2019-12-05 16:27:10 +1100
committerChris Johns <chrisj@rtems.org>2019-12-05 16:27:10 +1100
commitad5d3afea91ab701c9c1c6161762e9196d77c3bd (patch)
tree66b6ab792be4fa7348c2d9947732d6121f2789f6
parentc11d142f954f57deee5ebcfd4c24e202436a4ea3 (diff)
sb: VERSION may not contain a release path or hashes
-rw-r--r--source-builder/sb/options.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py
index 7e506b0..3e53a11 100644
--- a/source-builder/sb/options.py
+++ b/source-builder/sb/options.py
@@ -705,14 +705,14 @@ def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc', logfile = Tru
#
def setting_error(msg):
raise error.general(msg)
- hashes = version.load_release_settings('hashes', error = setting_error)
+ hashes = version.load_release_settings('hashes')
for hash in hashes:
hs = hash[1].split()
if len(hs) != 2:
raise error.general('invalid release hash in VERSION')
sources.hash((hs[0], hash[0], hs[1]), o.defaults, setting_error)
release_path = version.load_release_setting('version', 'release_path',
- raw = True, error = setting_error)
+ raw = True)
if release_path is not None:
try:
release_path = ','.join([rp.strip() for rp in release_path.split(',')])