[rtems-libbsd commit] Fix the sed generator for processing INI configuration files.

Sebastian Huber sebh at rtems.org
Wed Jun 26 11:44:32 UTC 2019


Module:    rtems-libbsd
Branch:    5-freebsd-12
Commit:    35a7b448f9e6d044bf3ec3482be4f81b8061fbec
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=35a7b448f9e6d044bf3ec3482be4f81b8061fbec

Author:    Chris Johns <chrisj at rtems.org>
Date:      Thu Apr  4 17:16:28 2019 +1100

Fix the sed generator for processing INI configuration files.

---

 waf_libbsd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/waf_libbsd.py b/waf_libbsd.py
index bc73236..46237c2 100644
--- a/waf_libbsd.py
+++ b/waf_libbsd.py
@@ -228,6 +228,7 @@ class Builder(builder.ModuleManager):
         except:
             bld.fatal('network configuraiton \'%s\' read failed' % (bld.env.NET_CONFIG))
         lc = 0
+        sed = 'sed '
         for l in net_cfg_lines:
             lc += 1
             if l.strip().startswith('NET_CFG_'):
@@ -237,10 +238,9 @@ class Builder(builder.ModuleManager):
                               'parse error: %d: %s' % (bld.env.NET_CONFIG, lc, l))
                 lhs = ls[0].strip()
                 rhs = ls[1].strip()
-                sed = 'sed '
                 for t in tags:
                     if lhs == t:
-                        sed += "-e 's/@%s@/%s/'" % (t, rhs)
+                        sed += "-e 's/@%s@/%s/' " % (t, rhs)
         bld(target = "testsuite/include/rtems/bsd/test/network-config.h",
             source = "testsuite/include/rtems/bsd/test/network-config.h.in",
             rule = sed + " < ${SRC} > ${TGT}",




More information about the vc mailing list