[rtems-source-builder commit] sb: VERSION may not contain a release path or hashes

Chris Johns chrisj at rtems.org
Thu Dec 5 05:32:34 UTC 2019


Module:    rtems-source-builder
Branch:    master
Commit:    ad5d3afea91ab701c9c1c6161762e9196d77c3bd
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=ad5d3afea91ab701c9c1c6161762e9196d77c3bd

Author:    Chris Johns <chrisj at rtems.org>
Date:      Thu Dec  5 16:27:10 2019 +1100

sb: VERSION may not contain a release path or hashes

---

 source-builder/sb/options.py | 4 ++--
 1 file 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(',')])



More information about the vc mailing list