BUG/MINOR: admin: haproxy-reload rename -vv long option

The -vv option used --verbose as its long form, which was identical to
the long form of -v. Since the case statement matches top-to-bottom,
--verbose would always trigger -v (VERBOSE=2), making -vv unreachable
via its long option. The long form is renamed to --verbose=all to avoid
the conflict, and the usage string is updated accordingly.

Must be backported to 3.3.

diff --git a/admin/cli/haproxy-reload b/admin/cli/haproxy-reload
index a3f07ef456a17fc1e5497eeedddae4daf75afcc8..180e483f832fa8600ea60f760792aa71c8e846e3 100755 (executable)
--- a/admin/cli/haproxy-reload
+++ b/admin/cli/haproxy-reload
@@ -62,7 +62,7 @@ usage() {
        echo "  -t,  --timeout                Timeout (socat -t) (default: ${TIMEOUT})"
        echo "  -s,  --silent                 Silent mode (no output)"
        echo "  -v,  --verbose                Verbose output (output from haproxy on failure)"
-       echo "  -vv                           Even more verbose output (output from haproxy on success and failure)"
+       echo "  -vv  --verbose=all            Very verbose output (output from haproxy on success and failure)"
        echo "  -h,  --help                   This help"
        echo ""
        echo "Examples:"
@@ -89,7 +89,7 @@ main() {
                                VERBOSE=2
                                shift
                                ;;
-                       -vv|--verbose)
+                       -vv|--verbose=all)
                                VERBOSE=3
                                shift
                                ;;