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

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

  1. fix-mktemp-bug-986151
  2. Merge into 2.0
Proposed by Daniel Nichter
Status: Merged
Merged at revision: 233
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/fix-mktemp-bug-986151
Merge into: lp:percona-toolkit/2.0
Diff against target: 193 lines (+24/-27)
8 files modified
bin/pt-ioprofile (+1/-1)
bin/pt-mext (+5/-5)
bin/pt-mysql-summary (+5/-5)
bin/pt-pmp (+1/-1)
bin/pt-sift (+5/-8)
bin/pt-stalk (+1/-1)
bin/pt-summary (+5/-5)
lib/bash/tmpdir.sh (+1/-1)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/fix-mktemp-bug-986151
Reviewer Review Type Date Requested Status
Daniel Nichter Approve
Review via email: mp+106031@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
1=== modified file 'bin/pt-ioprofile'
2--- bin/pt-ioprofile 2012-03-07 23:41:54 +0000
3+++ bin/pt-ioprofile 2012-05-16 17:37:18 +0000
4@@ -425,7 +425,7 @@
5 else
6 local tool="${0##*/}"
7 local pid="$$"
8- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
9+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
10 || die "Cannot make secure tmpdir"
11 fi
12 }
13
14=== modified file 'bin/pt-mext'
15--- bin/pt-mext 2012-03-07 23:41:54 +0000
16+++ bin/pt-mext 2012-05-16 17:37:18 +0000
17@@ -29,24 +29,24 @@
18 TMPDIR=""
19
20 mk_tmpdir() {
21- local dir=${1:-""}
22+ local dir="${1:-""}"
23
24 if [ -n "$dir" ]; then
25 if [ ! -d "$dir" ]; then
26- mkdir $dir || die "Cannot make tmpdir $dir"
27+ mkdir "$dir" || die "Cannot make tmpdir $dir"
28 fi
29 TMPDIR="$dir"
30 else
31- local tool=`basename $0`
32+ local tool="${0##*/}"
33 local pid="$$"
34- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
35+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
36 || die "Cannot make secure tmpdir"
37 fi
38 }
39
40 rm_tmpdir() {
41 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
42- rm -rf $TMPDIR
43+ rm -rf "$TMPDIR"
44 fi
45 TMPDIR=""
46 }
47
48=== modified file 'bin/pt-mysql-summary'
49--- bin/pt-mysql-summary 2012-03-07 23:41:54 +0000
50+++ bin/pt-mysql-summary 2012-05-16 17:37:18 +0000
51@@ -25,24 +25,24 @@
52 TMPDIR=""
53
54 mk_tmpdir() {
55- local dir=${1:-""}
56+ local dir="${1:-""}"
57
58 if [ -n "$dir" ]; then
59 if [ ! -d "$dir" ]; then
60- mkdir $dir || die "Cannot make tmpdir $dir"
61+ mkdir "$dir" || die "Cannot make tmpdir $dir"
62 fi
63 TMPDIR="$dir"
64 else
65- local tool=`basename $0`
66+ local tool="${0##*/}"
67 local pid="$$"
68- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
69+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
70 || die "Cannot make secure tmpdir"
71 fi
72 }
73
74 rm_tmpdir() {
75 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
76- rm -rf $TMPDIR
77+ rm -rf "$TMPDIR"
78 fi
79 TMPDIR=""
80 }
81
82=== modified file 'bin/pt-pmp'
83--- bin/pt-pmp 2012-03-07 23:41:54 +0000
84+++ bin/pt-pmp 2012-05-16 17:37:18 +0000
85@@ -28,7 +28,7 @@
86 else
87 local tool="${0##*/}"
88 local pid="$$"
89- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
90+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
91 || die "Cannot make secure tmpdir"
92 fi
93 }
94
95=== modified file 'bin/pt-sift'
96--- bin/pt-sift 2012-03-26 23:53:54 +0000
97+++ bin/pt-sift 2012-05-16 17:37:18 +0000
98@@ -22,30 +22,27 @@
99 # See https://launchpad.net/percona-toolkit for more information.
100 # ###########################################################################
101
102-# pt-sift isn't ready for this yet.
103-#set -u
104-
105 TMPDIR=""
106
107 mk_tmpdir() {
108- local dir=${1:-""}
109+ local dir="${1:-""}"
110
111 if [ -n "$dir" ]; then
112 if [ ! -d "$dir" ]; then
113- mkdir $dir || die "Cannot make tmpdir $dir"
114+ mkdir "$dir" || die "Cannot make tmpdir $dir"
115 fi
116 TMPDIR="$dir"
117 else
118- local tool=`basename $0`
119+ local tool="${0##*/}"
120 local pid="$$"
121- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
122+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
123 || die "Cannot make secure tmpdir"
124 fi
125 }
126
127 rm_tmpdir() {
128 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
129- rm -rf $TMPDIR
130+ rm -rf "$TMPDIR"
131 fi
132 TMPDIR=""
133 }
134
135=== modified file 'bin/pt-stalk'
136--- bin/pt-stalk 2012-05-15 19:15:05 +0000
137+++ bin/pt-stalk 2012-05-16 17:37:18 +0000
138@@ -439,7 +439,7 @@
139 else
140 local tool="${0##*/}"
141 local pid="$$"
142- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
143+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
144 || die "Cannot make secure tmpdir"
145 fi
146 }
147
148=== modified file 'bin/pt-summary'
149--- bin/pt-summary 2012-03-07 23:41:54 +0000
150+++ bin/pt-summary 2012-05-16 17:37:18 +0000
151@@ -56,24 +56,24 @@
152 TMPDIR=""
153
154 mk_tmpdir() {
155- local dir=${1:-""}
156+ local dir="${1:-""}"
157
158 if [ -n "$dir" ]; then
159 if [ ! -d "$dir" ]; then
160- mkdir $dir || die "Cannot make tmpdir $dir"
161+ mkdir "$dir" || die "Cannot make tmpdir $dir"
162 fi
163 TMPDIR="$dir"
164 else
165- local tool=`basename $0`
166+ local tool="${0##*/}"
167 local pid="$$"
168- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
169+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
170 || die "Cannot make secure tmpdir"
171 fi
172 }
173
174 rm_tmpdir() {
175 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
176- rm -rf $TMPDIR
177+ rm -rf "$TMPDIR"
178 fi
179 TMPDIR=""
180 }
181
182=== modified file 'lib/bash/tmpdir.sh'
183--- lib/bash/tmpdir.sh 2012-01-31 17:20:37 +0000
184+++ lib/bash/tmpdir.sh 2012-05-16 17:37:18 +0000
185@@ -45,7 +45,7 @@
186 else
187 local tool="${0##*/}"
188 local pid="$$"
189- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
190+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
191 || die "Cannot make secure tmpdir"
192 fi
193 }

Subscribers

People subscribed via source and target branches