On 1/29/21 3:12 PM, Mark Gray wrote:
> On 29/01/2021 14:02, Ilya Maximets wrote:
>> ovsdb-doc includes python code that requires dirs.py to exist.
>> This change fixes broken 'make manpage-check' target:
>>
>> # make manpage-check
>> Traceback (most recent call last):
>> File "./ovsdb/ovsdb-doc", line 25, in <module>
>> import ovs.db.schema
>> File "/root/ovs/python/ovs/db/schema.py", line 19, in <module>
>> import ovs.db.types
>> File "/root/ovs/python/ovs/db/types.py", line 18, in <module>
>> import ovs.db.data
>> File "/root/ovs/python/ovs/db/data.py", line 22, in <module>
>> import ovs.jsonrpc
>> File "/root/ovs/python/ovs/jsonrpc.py", line 21, in <module>
>> import ovs.poller
>> File "/root/ovs/python/ovs/poller.py", line 23, in <module>
>> import ovs.vlog
>> File "/root/ovs/python/ovs/vlog.py", line 25, in <module>
>> import ovs.dirs
>> ModuleNotFoundError: No module named 'ovs.dirs'
>>
>> Fixes: 943c4a325045 ("python: set ovs.dirs variables with build system
>> values")
>> Signed-off-by: Ilya Maximets <[email protected]>
>> ---
>> ovsdb/automake.mk | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
>> index d60f3f4ec..446d6c136 100644
>> --- a/ovsdb/automake.mk
>> +++ b/ovsdb/automake.mk
>> @@ -111,6 +111,7 @@ $(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in python/ovs/dirs.py
>> # ovsdb-doc
>> EXTRA_DIST += ovsdb/ovsdb-doc
>> OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc
>> +ovsdb/ovsdb-doc: python/ovs/dirs.py
>
> Thanks
>
> I thought we had got them all with the '$(OVSIDL_BUILT)' target :( How
> was this missed? Is this not run with a standard 'make'?
It is part of a common build, but it seems that it's likely executed after
some idl targets so dirs.py is already there. But if you're requesting only
manpage generation you will not have idl targets executed, so no dirs.py.
>
>>
>> # ovsdb-dot
>> EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
>
> Acked-by: Mark Gray <[email protected]>
>
>>
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
