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
1=== modified file 'bin/pt-ioprofile'
2--- bin/pt-ioprofile 2012-04-03 19:42:45 +0000
3+++ bin/pt-ioprofile 2012-05-16 17:41:20 +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-04-03 19:42:45 +0000
16+++ bin/pt-mext 2012-05-16 17:41:20 +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-05-07 22:58:57 +0000
50+++ bin/pt-mysql-summary 2012-05-16 17:41:20 +0000
51@@ -445,7 +445,7 @@
52 else
53 local tool="${0##*/}"
54 local pid="$$"
55- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
56+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
57 || die "Cannot make secure tmpdir"
58 fi
59 }
60
61=== modified file 'bin/pt-pmp'
62--- bin/pt-pmp 2012-04-03 19:42:45 +0000
63+++ bin/pt-pmp 2012-05-16 17:41:20 +0000
64@@ -28,7 +28,7 @@
65 else
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=== modified file 'bin/pt-sift'
75--- bin/pt-sift 2012-04-03 19:42:45 +0000
76+++ bin/pt-sift 2012-05-16 17:41:20 +0000
77@@ -22,30 +22,27 @@
78 # See https://launchpad.net/percona-toolkit for more information.
79 # ###########################################################################
80
81-# pt-sift isn't ready for this yet.
82-#set -u
83-
84 TMPDIR=""
85
86 mk_tmpdir() {
87- local dir=${1:-""}
88+ local dir="${1:-""}"
89
90 if [ -n "$dir" ]; then
91 if [ ! -d "$dir" ]; then
92- mkdir $dir || die "Cannot make tmpdir $dir"
93+ mkdir "$dir" || die "Cannot make tmpdir $dir"
94 fi
95 TMPDIR="$dir"
96 else
97- local tool=`basename $0`
98+ local tool="${0##*/}"
99 local pid="$$"
100- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
101+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
102 || die "Cannot make secure tmpdir"
103 fi
104 }
105
106 rm_tmpdir() {
107 if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
108- rm -rf $TMPDIR
109+ rm -rf "$TMPDIR"
110 fi
111 TMPDIR=""
112 }
113
114=== modified file 'bin/pt-stalk'
115--- bin/pt-stalk 2012-05-15 19:10:24 +0000
116+++ bin/pt-stalk 2012-05-16 17:41:20 +0000
117@@ -439,7 +439,7 @@
118 else
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=== modified file 'bin/pt-summary'
128--- bin/pt-summary 2012-05-07 22:58:57 +0000
129+++ bin/pt-summary 2012-05-16 17:41:20 +0000
130@@ -452,7 +452,7 @@
131 else
132 local tool="${0##*/}"
133 local pid="$$"
134- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
135+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
136 || die "Cannot make secure tmpdir"
137 fi
138 }
139
140=== modified file 'lib/bash/tmpdir.sh'
141--- lib/bash/tmpdir.sh 2012-01-31 17:20:37 +0000
142+++ lib/bash/tmpdir.sh 2012-05-16 17:41:20 +0000
143@@ -45,7 +45,7 @@
144 else
145 local tool="${0##*/}"
146 local pid="$$"
147- TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
148+ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
149 || die "Cannot make secure tmpdir"
150 fi
151 }

Subscribers

People subscribed via source and target branches