projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs.db.data: Fix bugs in Atom.is_default() and Datum.is_default().
[openvswitch]
/
utilities
/
ovs-vsctl.c
diff --git
a/utilities/ovs-vsctl.c
b/utilities/ovs-vsctl.c
index 1c67b1112d99eeed472a570f7f91170e66ce3f79..573c9481d29f3f335f9c8bf848700904502d5c1e 100644
(file)
--- a/
utilities/ovs-vsctl.c
+++ b/
utilities/ovs-vsctl.c
@@
-262,7
+262,7
@@
parse_options(int argc, char *argv[])
usage();
case 'V':
usage();
case 'V':
-
OVS_PRINT_VERSION
(0, 0);
+
ovs_print_version
(0, 0);
exit(EXIT_SUCCESS);
case 't':
exit(EXIT_SUCCESS);
case 't':
@@
-444,7
+444,7
@@
vsctl_fatal(const char *format, ...)
message = xvasprintf(format, args);
va_end(args);
message = xvasprintf(format, args);
va_end(args);
- vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_
EMER
);
+ vlog_set_levels(&VLM_vsctl, VLF_CONSOLE, VLL_
OFF
);
VLOG_ERR("%s", message);
ovs_error(0, "%s", message);
vsctl_exit(EXIT_FAILURE);
VLOG_ERR("%s", message);
ovs_error(0, "%s", message);
vsctl_exit(EXIT_FAILURE);
@@
-3680,6
+3680,10
@@
do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
case TXN_ERROR:
vsctl_fatal("transaction error: %s", error);
case TXN_ERROR:
vsctl_fatal("transaction error: %s", error);
+ case TXN_NOT_LOCKED:
+ /* Should not happen--we never call ovsdb_idl_set_lock(). */
+ vsctl_fatal("database not locked");
+
default:
NOT_REACHED();
}
default:
NOT_REACHED();
}