Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/fix-mktemp-bug-986151-2.1 into lp:percona-toolkit/2.1

  1. fix-mktemp-bug-986151-2.1
  2. Merge into 2.1
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 256
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-mktemp-bug-986151-2.1
Merge into: lp:percona-toolkit/2.1
Diff against target: 151 lines (+16/-19)
8 files modified
bin/pt-ioprofile (+1/-1)
bin/pt-mext (+5/-5)
bin/pt-mysql-summary (+1/-1)
bin/pt-pmp (+1/-1)
bin/pt-sift (+5/-8)
bin/pt-stalk (+1/-1)
bin/pt-summary (+1/-1)
lib/bash/tmpdir.sh (+1/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-mktemp-bug-986151-2.1
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+106033@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/pt-ioprofile'
--- bin/pt-ioprofile 2012-04-03 19:42:45 +0000
+++ bin/pt-ioprofile 2012-05-16 17:41:20 +0000
@@ -425,7 +425,7 @@
425 else425 else
426 local tool="${0##*/}"426 local tool="${0##*/}"
427 local pid="$$"427 local pid="$$"
428 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \428 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
429 || die "Cannot make secure tmpdir"429 || die "Cannot make secure tmpdir"
430 fi430 fi
431}431}
432432
=== modified file 'bin/pt-mext'
--- bin/pt-mext 2012-04-03 19:42:45 +0000
+++ bin/pt-mext 2012-05-16 17:41:20 +0000
@@ -29,24 +29,24 @@
29TMPDIR=""29TMPDIR=""
3030
31mk_tmpdir() {31mk_tmpdir() {
32 local dir=${1:-""}32 local dir="${1:-""}"
3333
34 if [ -n "$dir" ]; then34 if [ -n "$dir" ]; then
35 if [ ! -d "$dir" ]; then35 if [ ! -d "$dir" ]; then
36 mkdir $dir || die "Cannot make tmpdir $dir"36 mkdir "$dir" || die "Cannot make tmpdir $dir"
37 fi37 fi
38 TMPDIR="$dir"38 TMPDIR="$dir"
39 else39 else
40 local tool=`basename $0`40 local tool="${0##*/}"
41 local pid="$$"41 local pid="$$"
42 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \42 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
43 || die "Cannot make secure tmpdir"43 || die "Cannot make secure tmpdir"
44 fi44 fi
45}45}
4646
47rm_tmpdir() {47rm_tmpdir() {
48 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then48 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
49 rm -rf $TMPDIR49 rm -rf "$TMPDIR"
50 fi50 fi
51 TMPDIR=""51 TMPDIR=""
52}52}
5353
=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary 2012-05-07 22:58:57 +0000
+++ bin/pt-mysql-summary 2012-05-16 17:41:20 +0000
@@ -445,7 +445,7 @@
445 else445 else
446 local tool="${0##*/}"446 local tool="${0##*/}"
447 local pid="$$"447 local pid="$$"
448 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \448 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
449 || die "Cannot make secure tmpdir"449 || die "Cannot make secure tmpdir"
450 fi450 fi
451}451}
452452
=== modified file 'bin/pt-pmp'
--- bin/pt-pmp 2012-04-03 19:42:45 +0000
+++ bin/pt-pmp 2012-05-16 17:41:20 +0000
@@ -28,7 +28,7 @@
28 else28 else
29 local tool="${0##*/}"29 local tool="${0##*/}"
30 local pid="$$"30 local pid="$$"
31 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \31 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
32 || die "Cannot make secure tmpdir"32 || die "Cannot make secure tmpdir"
33 fi33 fi
34}34}
3535
=== modified file 'bin/pt-sift'
--- bin/pt-sift 2012-04-03 19:42:45 +0000
+++ bin/pt-sift 2012-05-16 17:41:20 +0000
@@ -22,30 +22,27 @@
22# See https://launchpad.net/percona-toolkit for more information.22# See https://launchpad.net/percona-toolkit for more information.
23# ###########################################################################23# ###########################################################################
2424
25# pt-sift isn't ready for this yet.
26#set -u
27
28TMPDIR=""25TMPDIR=""
2926
30mk_tmpdir() {27mk_tmpdir() {
31 local dir=${1:-""}28 local dir="${1:-""}"
3229
33 if [ -n "$dir" ]; then30 if [ -n "$dir" ]; then
34 if [ ! -d "$dir" ]; then31 if [ ! -d "$dir" ]; then
35 mkdir $dir || die "Cannot make tmpdir $dir"32 mkdir "$dir" || die "Cannot make tmpdir $dir"
36 fi33 fi
37 TMPDIR="$dir"34 TMPDIR="$dir"
38 else35 else
39 local tool=`basename $0`36 local tool="${0##*/}"
40 local pid="$$"37 local pid="$$"
41 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \38 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
42 || die "Cannot make secure tmpdir"39 || die "Cannot make secure tmpdir"
43 fi40 fi
44}41}
4542
46rm_tmpdir() {43rm_tmpdir() {
47 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then44 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
48 rm -rf $TMPDIR45 rm -rf "$TMPDIR"
49 fi46 fi
50 TMPDIR=""47 TMPDIR=""
51}48}
5249
=== modified file 'bin/pt-stalk'
--- bin/pt-stalk 2012-05-15 19:10:24 +0000
+++ bin/pt-stalk 2012-05-16 17:41:20 +0000
@@ -439,7 +439,7 @@
439 else439 else
440 local tool="${0##*/}"440 local tool="${0##*/}"
441 local pid="$$"441 local pid="$$"
442 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \442 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
443 || die "Cannot make secure tmpdir"443 || die "Cannot make secure tmpdir"
444 fi444 fi
445}445}
446446
=== modified file 'bin/pt-summary'
--- bin/pt-summary 2012-05-07 22:58:57 +0000
+++ bin/pt-summary 2012-05-16 17:41:20 +0000
@@ -452,7 +452,7 @@
452 else452 else
453 local tool="${0##*/}"453 local tool="${0##*/}"
454 local pid="$$"454 local pid="$$"
455 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \455 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
456 || die "Cannot make secure tmpdir"456 || die "Cannot make secure tmpdir"
457 fi457 fi
458}458}
459459
=== modified file 'lib/bash/tmpdir.sh'
--- lib/bash/tmpdir.sh 2012-01-31 17:20:37 +0000
+++ lib/bash/tmpdir.sh 2012-05-16 17:41:20 +0000
@@ -45,7 +45,7 @@
45 else45 else
46 local tool="${0##*/}"46 local tool="${0##*/}"
47 local pid="$$"47 local pid="$$"
48 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \48 TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
49 || die "Cannot make secure tmpdir"49 || die "Cannot make secure tmpdir"
50 fi50 fi
51}51}

Subscribers

People subscribed via source and target branches