python: Make build number format consistent with C.

The C code displays the build number as the empty string when 0,
and as +build<num> otherwise.  This commit updates version.py to be
consistent and tests that it is in the unit tests.

Signed-off-by: Ethan Jackson <ethan@nicira.com>

diff --git a/python/automake.mk b/python/automake.mk
index f9d2c575ff64afb569a572d8d1733009f02c1ecc..96720421075c44763dd9378f659f3210e6829416 100644 (file)
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -64,5 +64,8 @@ ALL_LOCAL += $(srcdir)/python/ovs/version.py
 $(srcdir)/python/ovs/version.py: config.status
        $(ro_shell) > $@.tmp
        echo 'VERSION = "$(VERSION)"' >> $@.tmp
-       echo 'BUILDNR = "$(BUILDNR)"' >> $@.tmp
+       if [ "$(BUILDNR)" != "0" ]; \
+           then echo 'BUILDNR = "+build$(BUILDNR)"' >> $@.tmp; \
+           else echo 'BUILDNR = ""' >> $@.tmp; \
+       fi;
        mv $@.tmp $@

diff --git a/python/ovs/unixctl.py b/python/ovs/unixctl.py
index 8921ba8c2e579b59bd2b3bcd7db6564b1cbce650..4a591a7eeb58d3465c2957f81fa15087ae67873c 100644 (file)
--- a/python/ovs/unixctl.py
+++ b/python/ovs/unixctl.py
@@ -57,9 +57,9 @@ def _unixctl_help(conn, unused_argv, unused_aux):
 
 def _unixctl_version(conn, unused_argv, unused_aux):
     assert isinstance(conn, UnixctlConnection)
-    version = "%s (Open vSwitch) %s %s" % (ovs.util.PROGRAM_NAME,
-                                           ovs.version.VERSION,
-                                           ovs.version.BUILDNR)
+    version = "%s (Open vSwitch) %s%s" % (ovs.util.PROGRAM_NAME,
+                                          ovs.version.VERSION,
+                                          ovs.version.BUILDNR)
     conn.reply(version)
 
 

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 400a5c58666108f7f406db89fc56ad88e1dddc71..1d37b59a74aa18096cd461bdf54f4ad88a552aee 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,4 @@
 # -*- shell-script -*-
-VERSION='@VERSION@'
-BUILDNR='@BUILDNR@'
 HAVE_OPENSSL='@HAVE_OPENSSL@'
 HAVE_PYTHON='@HAVE_PYTHON@'
 PERL='@PERL@'

diff --git a/tests/unixctl-py.at b/tests/unixctl-py.at
index 8317add8b2d619ab17b732d6326d6586226125ae..52fb72a9ef2b6e36a4453bc264fa7ae0dd1ca317 100644 (file)
--- a/tests/unixctl-py.at
+++ b/tests/unixctl-py.at
@@ -109,7 +109,7 @@ The available commands are:
 mv stdout expout
 AT_CHECK([PYAPPCTL -t test-unixctl.py help], [0], [expout])
 
-AT_CHECK([echo "test-unixctl.py (Open vSwitch) $VERSION $BUILDNR" > expout])
+AT_CHECK([ovs-vsctl --version | sed 's/ovs-vsctl/test-unixctl.py/' | head -1 > expout])
 AT_CHECK([APPCTL -t test-unixctl.py version], [0], [expout])
 AT_CHECK([PYAPPCTL -t test-unixctl.py version], [0], [expout])