mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-21 14:49:41 +00:00
Code Issues Releases Wiki Activity

python: Make build number format consistent with C.

Browse Source 
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>
This commit is contained in:
Ethan Jackson
2012-03-07 15:48:32 -08:00
parent 7921b912de
commit c9a2d670eb
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/automake.mk
View File

@@ -64,5 +64,8 @@ ALL_LOCAL += $(srcdir)/python/ovs/version.py
$(srcdir)/python/ovs/version.py: config.status $(srcdir)/python/ovs/version.py: config.status
$(ro_shell) > $@.tmp $(ro_shell) > $@.tmp
echo 'VERSION = "$(VERSION)"' >> $@.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 $@ mv $@.tmp $@

6
python/ovs/unixctl.py
View File

@@ -57,9 +57,9 @@ def _unixctl_help(conn, unused_argv, unused_aux):
def _unixctl_version(conn, unused_argv, unused_aux): def _unixctl_version(conn, unused_argv, unused_aux):
assert isinstance(conn, UnixctlConnection) assert isinstance(conn, UnixctlConnection)
version = "%s (Open vSwitch) %s %s" % (ovs.util.PROGRAM_NAME, version = "%s (Open vSwitch) %s%s" % (ovs.util.PROGRAM_NAME,
ovs.version.VERSION, ovs.version.VERSION,
ovs.version.BUILDNR) ovs.version.BUILDNR)
conn.reply(version) conn.reply(version)

2
tests/atlocal.in
View File

@@ -1,6 +1,4 @@
# -*- shell-script -*- # -*- shell-script -*-
VERSION='@VERSION@'
BUILDNR='@BUILDNR@'
HAVE_OPENSSL='@HAVE_OPENSSL@' HAVE_OPENSSL='@HAVE_OPENSSL@'
HAVE_PYTHON='@HAVE_PYTHON@' HAVE_PYTHON='@HAVE_PYTHON@'
PERL='@PERL@' PERL='@PERL@'

2
tests/unixctl-py.at
View File

@@ -109,7 +109,7 @@ The available commands are:
mv stdout expout mv stdout expout
AT_CHECK([PYAPPCTL -t test-unixctl.py help], [0], [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([APPCTL -t test-unixctl.py version], [0], [expout])
AT_CHECK([PYAPPCTL -t test-unixctl.py version], [0], [expout]) AT_CHECK([PYAPPCTL -t test-unixctl.py version], [0], [expout])