percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-19 02:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 1038995: pt-stalk notify-by-email fails

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-08-20 19:22:31 -03:00
parent 1481494ef1
commit c2b006eeaf
6 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/pt-ioprofile
View File

@@ -356,6 +356,9 @@ _parse_command_line() {
if [ -f "$PT_TMPDIR/po/$base_opt" ]; then if [ -f "$PT_TMPDIR/po/$base_opt" ]; then
opt_is_negated=1 opt_is_negated=1
opt="$base_opt" opt="$base_opt"
else
opt_is_negated=""
opt=$(echo $opt | sed 's/^-*//')
fi fi
else else
if $(echo $opt | grep '^--no-' >/dev/null); then if $(echo $opt | grep '^--no-' >/dev/null); then

3
bin/pt-mysql-summary
View File

@@ -358,6 +358,9 @@ _parse_command_line() {
if [ -f "$PT_TMPDIR/po/$base_opt" ]; then if [ -f "$PT_TMPDIR/po/$base_opt" ]; then
opt_is_negated=1 opt_is_negated=1
opt="$base_opt" opt="$base_opt"
else
opt_is_negated=""
opt=$(echo $opt | sed 's/^-*//')
fi fi
else else
if $(echo $opt | grep '^--no-' >/dev/null); then if $(echo $opt | grep '^--no-' >/dev/null); then

3
bin/pt-stalk
View File

@@ -358,6 +358,9 @@ _parse_command_line() {
if [ -f "$PT_TMPDIR/po/$base_opt" ]; then if [ -f "$PT_TMPDIR/po/$base_opt" ]; then
opt_is_negated=1 opt_is_negated=1
opt="$base_opt" opt="$base_opt"
else
opt_is_negated=""
opt=$(echo $opt | sed 's/^-*//')
fi fi
else else
if $(echo $opt | grep '^--no-' >/dev/null); then if $(echo $opt | grep '^--no-' >/dev/null); then

3
bin/pt-summary
View File

@@ -365,6 +365,9 @@ _parse_command_line() {
if [ -f "$PT_TMPDIR/po/$base_opt" ]; then if [ -f "$PT_TMPDIR/po/$base_opt" ]; then
opt_is_negated=1 opt_is_negated=1
opt="$base_opt" opt="$base_opt"
else
opt_is_negated=""
opt=$(echo $opt | sed 's/^-*//')
fi fi
else else
if $(echo $opt | grep '^--no-' >/dev/null); then if $(echo $opt | grep '^--no-' >/dev/null); then

3
lib/bash/parse_options.sh
View File

@@ -424,6 +424,9 @@ _parse_command_line() {
if [ -f "$PT_TMPDIR/po/$base_opt" ]; then if [ -f "$PT_TMPDIR/po/$base_opt" ]; then
opt_is_negated=1 opt_is_negated=1
opt="$base_opt" opt="$base_opt"
else
opt_is_negated=""
opt=$(echo $opt | sed 's/^-*//')
fi fi
else else
# Handle normal cases: --option and --no-option. # Handle normal cases: --option and --no-option.

14
t/lib/bash/parse_options.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
plan 81 plan 83
TMPFILE="$TEST_PT_TMPDIR/parse-opts-output" TMPFILE="$TEST_PT_TMPDIR/parse-opts-output"
TOOL="pt-stalk" TOOL="pt-stalk"
@@ -246,6 +246,18 @@ is "$OPT_DISK_BYTES_FREE" "104857600" "Size: 100M"
parse_options "$T_LIB_DIR/samples/bash/po004.sh" parse_options "$T_LIB_DIR/samples/bash/po004.sh"
is "$OPT_DISK_BYTES_FREE" "104857600" "Size: 100M default" is "$OPT_DISK_BYTES_FREE" "104857600" "Size: 100M default"
# ############################################################################
# Bug 1038995: pt-stalk notify-by-email fails
# https://bugs.launchpad.net/percona-toolkit/+bug/1038995
# ############################################################################
# This failed because --notify was misparsed as --no-tify
parse_options "$T_LIB_DIR/samples/bash/po005.sh"
is "$OPT_NOTIFY_BY_EMAIL" "" "Bug 1038995: --notify-by-email is empty by default"
parse_options "$T_LIB_DIR/samples/bash/po005.sh" --notify-by-email foo@bar.com
is "$OPT_NOTIFY_BY_EMAIL" "foo@bar.com" "Bug 1038995: ...but gets set without errors if specified"
# ############################################################################ # ############################################################################
# Done # Done
# ############################################################################ # ############################################################################