On Thu, Oct 17, 2013 at 07:41:31PM -0700, Ansis Atteka wrote:
> On Thu, Oct 17, 2013 at 6:19 PM, Ansis Atteka <[email protected]> wrote:
> > On Thu, Oct 17, 2013 at 3:21 PM, Ben Pfaff <[email protected]> wrote:
> >> Builds for xenserver are failing now because xenserver doesn't have the
> >> uuid.py module (it uses a too-old python):
> >>
> >> File "./ovsdb/ovsdb-doc", line 12, in ?
> >> import ovs.db.schema
> >> File
> >> "/usr/src/redhat/BUILD/openvswitch-2.0.90.30095/python/ovs/db/schema.py",
> >> line 20, in ?
> >> from ovs.db import types
> >> File
> >> "/usr/src/redhat/BUILD/openvswitch-2.0.90.30095/python/ovs/db/types.py",
> >> line 16, in ?
> >> import uuid
> >> ImportError: No module named uuid
> >>
> >> We'll probably have to arrange to use python/compat if the install
> >> doesn't have its own uuid.py.
>
> Did you mean that we should append $(srcdir)/python/compat to
> PYTHONPATH just before ovs-vswitchd.conf.db.5 is built, if there is no
> uuid.py present on the buildserver already?
Yes, cribbing code from tests/atlocal.in, the fix could be something
like this:
diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 02d413e..f762471 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -46,6 +46,12 @@ man_MANS += vswitchd/ovs-vswitchd.conf.db.5
vswitchd/ovs-vswitchd.conf.db.5: \
ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
$(VSWITCH_PIC)
+ if python -m uuid 2>/dev/null; then \
+ : \
+ else \
+ PYTHONPATH=$$PYTHONPATH:$(abs_top_srcdir)/python/compat; \
+ export PYTHONPATH; \
+ fi; \
$(OVSDB_DOC) \
--title="ovs-vswitchd.conf.db" \
$(VSWITCH_DOT_DIAGRAM_ARG) \
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
