[ovs-dev,ovn,04/19] ovn-ctl: Change the order of ovn-lib and ovs-lib.
diff mbox series

Message ID 1571619079-75503-5-git-send-email-hzhou@ovn.org
State New
Headers show
  • OVN Interconnection
Related show

Commit Message

Han Zhou Oct. 21, 2019, 12:51 a.m. UTC
Some function names are identical in both libs, e.g. daemon_is_running().
Currently we included ovs-lib after ovn-lib, so the one in ovs-lib
overrides the one in ovn-lib, which results in unexpected behavior.

This patch changes the order so that functions in ovn-lib will take
effect when there is confict names.

Signed-off-by: Han Zhou <hzhou@ovn.org>
 utilities/ovn-ctl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/utilities/ovn-ctl b/utilities/ovn-ctl
index 481e28f..576a983 100755
--- a/utilities/ovn-ctl
+++ b/utilities/ovn-ctl
@@ -19,8 +19,8 @@  case $0 in
     *) dir0=./ ;;
-. "$dir0/ovn-lib" || exit 1
 . "$ovsdir/ovs-lib" || exit 1
+. "$dir0/ovn-lib" || exit 1
 for dir in "$sbindir" "$ovn_bindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do
     case :$PATH: in