RSB Couverture-Qemu build queries

[Chris Johns]

On 19/06/2017 20:33, Cillian O'Donnell wrote:
> On 18 June 2017 at 03:23, Chris Johns <chrisj at rtems.org> wrote:
>> On 17/6/17 6:38 am, Joel Sherrill wrote:
>>> On Fri, Jun 16, 2017 at 2:13 PM, Cillian O'Donnell <cpodonnell8 at gmail.com
>>> <mailto:cpodonnell8 at gmail.com>> wrote:
>> Use '--trace --dry-run' to debug until you get the command line you want.
> 
> The --dry-run option has been running into trouble for me. I had a
> look around the build config files and config.py but I haven't figured
> out how to fix it. The traceback starts at gettext, if I remove
> gettext it stops at libffi and if thats removed it stops at the next
> dependency and so on. It's the same for the current qemu too.
> 
> ../source-builder/sb-set-builder
> --prefix=$HOME/development/rtems/qemu_tools --dry-run --trace
> devel/couverture-qemu
> RTEMS Source Builder - Set Builder, 4.12 (14a801b3ceaa modified)
> Build Set: devel/couverture-qemu
> Build Set: devel/autotools-internal.bset
> config: devel/autoconf-2.69-1.cfg
> package: autoconf-2.69-x86_64-linux-gnu-1
>   See error report: rsb-report-autoconf-2.69-x86_64-linux-gnu-1.txt
> config: devel/automake-1.12.6-1.cfg
> package: automake-1.12.6-x86_64-linux-gnu-1
>   See error report: rsb-report-automake-1.12.6-x86_64-linux-gnu-1.txt
> config: devel/libtool-2.4.2-1.cfg
> package: libtool-2.4.2-x86_64-linux-gnu-1
>   See error report: rsb-report-libtool-2.4.2-x86_64-linux-gnu-1.txt
> cleaning: autoconf-2.69-x86_64-linux-gnu-1
> cleaning: automake-1.12.6-x86_64-linux-gnu-1
> cleaning: libtool-2.4.2-x86_64-linux-gnu-1
> Build Set: Time 0:00:00.312635
> config: devel/libiconv-1.14-1.cfg
> config: devel/gettext-0.18.3.1-1.cfg
> Build Set: Time 0:00:00.330358
> Traceback (most recent call last):
>   File "../source-builder/sb-set-builder", line 29, in <module>
>     setbuilder.run()
>   File "../source-builder/sb/setbuilder.py", line 502, in run
>     b.build(deps)
>   File "../source-builder/sb/setbuilder.py", line 347, in build
>     opts, macros)
>   File "../source-builder/sb/build.py", line 129, in __init__
>     self.config = config.file(name, opts, self.macros)
>   File "../source-builder/sb/config.py", line 249, in __init__
>     self.load(name)
>   File "../source-builder/sb/config.py", line 1258, in load
>     r = self._parse(config, dir, info)
>   File "../source-builder/sb/config.py", line 991, in _parse
>     l = self._expand(l)
>   File "../source-builder/sb/config.py", line 623, in _expand
>     ps = self._pkgconfig(epcl)
>   File "../source-builder/sb/config.py", line 481, in _pkgconfig
>     ps = self._pkgconfig_check(pcl[1:])
>   File "../source-builder/sb/config.py", line 425, in _pkgconfig_check
>     if self.macros['_dry_run'] == '1' and self.macros['with_download'] == '1':
>   File "../source-builder/sb/macros.py", line 147, in __getitem__
>     raise IndexError('key: %s' % (key))
> IndexError: key: with_download
> 

Please try and let me know if it is ok so I can push to master:

diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py
index da54ba3..a4f739b 100644
--- a/source-builder/sb/config.py
+++ b/source-builder/sb/config.py
@@ -422,7 +422,8 @@ class file:     def _pkgconfig_check(self, test):
         # Hack to by pass pkgconfig checks when just wanting to download the
         # source.
-        if self.macros['_dry_run'] == '1' and self.macros['with_download'] == '1':
+        if self.macros['_dry_run'] == '1' and \
+           ('with_download' in self.macros and self.macros['with_download'] == '1'):
             return '0'
         ok = False
         if type(test) == str: