From 82bca44845b8dd25d34d5ee4b7c75d95c8ccf82c Mon Sep 17 00:00:00 2001 From: Boden R Date: Fri, 15 Apr 2016 10:56:09 -0600 Subject: [PATCH] Fix Q_PLUGIN_EXTRA_CONF_FILES usage comment Related bug #1469434 fixed the usage comments for Q_PLUGIN_EXTRA_CONF_FILES. However that change didn't make it into neutron-legacy. This patch updates the comments in neutron-legacy to reflect proper assignment of Q_PLUGIN_EXTRA_CONF_FILES as well indicate Q_PLUGIN_CONF_PATH is required when using extra conf files. Change-Id: I447f1158d333ac4a35c4903a509146a62d93b272 Related-Bug: #1469434 Closes-Bug: #1542282 --- lib/neutron-legacy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 084a3569ba..c2729cb5d2 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -946,10 +946,11 @@ function _configure_neutron_common { # Set plugin-specific variables ``Q_DB_NAME``, ``Q_PLUGIN_CLASS``. # For main plugin config file, set ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``. - # For addition plugin config files, set ``Q_PLUGIN_EXTRA_CONF_PATH``, + # For addition plugin config files, set ``Q_PLUGIN_EXTRA_CONF_PATH`` and # ``Q_PLUGIN_EXTRA_CONF_FILES``. For example: # - # ``Q_PLUGIN_EXTRA_CONF_FILES=(file1, file2)`` + # ``Q_PLUGIN_CONF_PATH=/path/to/plugins`` + # ``Q_PLUGIN_EXTRA_CONF_FILES=(file1 file2)`` neutron_plugin_configure_common if [[ "$Q_PLUGIN_CONF_PATH" == '' || "$Q_PLUGIN_CONF_FILENAME" == '' || "$Q_PLUGIN_CLASS" == '' ]]; then