diff options
author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 20:30:44 +0300 |
---|---|---|
committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2015-03-23 20:33:00 +0300 |
commit | db2b7601c85a7c5f96e8d87cee74d318bce9a367 (patch) | |
tree | 81452d4f2f6a2b6c20ebdb5752d8f0d942e26fc0 /modules | |
parent | a22172e7b3628d10790cab24690a5ceb3e9ed5a0 (diff) | |
download | meson-db2b7601c85a7c5f96e8d87cee74d318bce9a367.zip meson-db2b7601c85a7c5f96e8d87cee74d318bce9a367.tar.gz meson-db2b7601c85a7c5f96e8d87cee74d318bce9a367.tar.bz2 |
modules/rpm: workaround when ext_prog not found locally
Traceback (most recent call last):
File "../../../meson.py", line 184, in <module>
app.generate()
File "../../../meson.py", line 130, in generate
intr.run()
File "/home/brain/git/upstream/meson/interpreter.py", line 828, in run
self.evaluate_codeblock(self.ast)
File "/home/brain/git/upstream/meson/interpreter.py", line 850, in
evaluate_codeblock
raise e
File "/home/brain/git/upstream/meson/interpreter.py", line 844, in
evaluate_codeblock
self.evaluate_statement(cur)
File "/home/brain/git/upstream/meson/interpreter.py", line 897, in
evaluate_statement
return self.method_call(cur)
File "/home/brain/git/upstream/meson/interpreter.py", line 1620, in
method_call
return obj.method_call(method_name, args, kwargs)
File "/home/brain/git/upstream/meson/interpreter.py", line 625, in
method_call
value = fn(state, args, kwargs)
File "/home/brain/git/upstream/meson/modules/rpm.py", line 98, in
generate_spec_template
fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath))
TypeError: sequence item 0: expected str instance, NoneType found
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'modules')
-rw-r--r-- | modules/rpm.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/rpm.py b/modules/rpm.py index 4ae1cc6..7171738 100644 --- a/modules/rpm.py +++ b/modules/rpm.py @@ -95,7 +95,10 @@ class RPMModule: 'You can use following command to find package which contains this lib:', mlog.bold('dnf provides %s' % lib.fullpath)) for prog in state.environment.coredata.ext_progs.values(): - fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) + if not prog.found(): + fn.write('BuildRequires: /usr/bin/%s # FIXME\n' % prog.get_name()) + else: + fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) fn.write('BuildRequires: meson\n') fn.write('\n') fn.write('%description\n') |