mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-01 18:25:59 +00:00
Remove trailing spaces (#665)
* Remove trailing spaces * PR-665 - Remove trailing spaces - Updated not stable test t/pt-online-schema-change/preserve_triggers.t - Updated utilities in bin directory * PR-665 - Remove trailing spaces - Fixed typos * PR-665 - Remove trailing spaces - Fixed typos --------- Co-authored-by: Sveta Smirnova <sveta.smirnova@percona.com>
This commit is contained in:
@@ -81,7 +81,7 @@ GO_SRC_DIR=$(git rev-parse --show-toplevel)/src/go
|
||||
# Programs and their options
|
||||
# ############################################################################
|
||||
|
||||
TAR=${TAR:-tar}
|
||||
TAR=${TAR:-tar}
|
||||
|
||||
# ############################################################################
|
||||
# Subroutines
|
||||
@@ -154,8 +154,8 @@ update_version() {
|
||||
die "Error updating version in Makefile.PL"
|
||||
fi
|
||||
rm "Makefile.PL.bak"
|
||||
echo "OK"
|
||||
|
||||
echo "OK"
|
||||
|
||||
echo -n "Updating version in percona-toolkit.pod... "
|
||||
cd $DOCS_DIR
|
||||
sed -i'.bak' -e "s/^Percona Toolkit v.*/Percona Toolkit v$VERSION released $DATE/" percona-toolkit.pod
|
||||
@@ -163,8 +163,8 @@ update_version() {
|
||||
die "Error updating version in percona-toolkit.pod"
|
||||
fi
|
||||
rm "percona-toolkit.pod.bak"
|
||||
echo "OK"
|
||||
|
||||
echo "OK"
|
||||
|
||||
echo -n "Updating version in sphinx-build/conf.py... "
|
||||
# What Sphinx calls version, we call series; what it calls release we
|
||||
# call version.
|
||||
@@ -179,7 +179,7 @@ update_version() {
|
||||
die "Error updating release in conf.py"
|
||||
fi
|
||||
rm "conf.py.bak"
|
||||
echo "OK"
|
||||
echo "OK"
|
||||
}
|
||||
|
||||
update_copyright_year() {
|
||||
@@ -288,7 +288,7 @@ update_changelog() {
|
||||
cat $BRANCH/Changelog | $BRANCH/util/log-entries $VERSION >> /tmp/changelog.tmp
|
||||
echo >> /tmp/changelog.tmp
|
||||
echo " -- Percona Toolkit Developers <toolkit-dev@percona.com> $DEB_DATE
|
||||
" >> /tmp/changelog.tmp
|
||||
" >> /tmp/changelog.tmp
|
||||
cat changelog >> /tmp/changelog.tmp
|
||||
mv /tmp/changelog.tmp changelog
|
||||
echo "OK"
|
||||
@@ -435,15 +435,15 @@ build_go_binaries() {
|
||||
TOOLKIT_DIR="${PERCONA_DIR}/percona-toolkit"
|
||||
GO_TOOLS_DIR="${TOOLKIT_DIR}/src/go"
|
||||
CUR_DIR=$(pwd)
|
||||
UNLINK=0
|
||||
UNLINK=0
|
||||
export PATH=${GOPATH}/bin:${PATH}
|
||||
|
||||
|
||||
echo "GOPATH: ${GOPATH}"
|
||||
echo "Github directory: ${GITHUB_DIR}"
|
||||
echo "Percona directory: ${PERCONA_DIR}"
|
||||
echo "Toolkit directory: ${TOOLKIT_DIR}"
|
||||
echo "Current directory: ${CUR_DIR}"
|
||||
|
||||
|
||||
if [[ ${BASE_DIR} != ${TOOLKIT_DIR} ]]
|
||||
then
|
||||
echo "not in gopath"
|
||||
@@ -562,7 +562,7 @@ if [ $UPDATE -eq 1 ]; then
|
||||
update_percona_toolkit_pod
|
||||
update_changelog
|
||||
update_rel_notes
|
||||
update_user_docs
|
||||
update_user_docs
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -601,7 +601,7 @@ MSG
|
||||
if [ $BUILD_RPM -eq 1 ]; then
|
||||
build_rpm
|
||||
fi
|
||||
|
||||
|
||||
BUILD_DEB=${BUILD_DEB:-1}
|
||||
if [ $BUILD_DEB -eq 1 ]; then
|
||||
build_deb
|
||||
|
@@ -65,14 +65,14 @@ prep_release_dir() {
|
||||
# Make temp snapshot dir so we can copy and modify files in it
|
||||
# without affecting the underlying bzr branch because, unlike
|
||||
# a release, we don't want to commit anything, but we do want
|
||||
# to modify stuff, namely the tools' version.
|
||||
# to modify stuff, namely the tools' version.
|
||||
if [ ! -d $SNAPSHOT_DIR ]; then
|
||||
mkdir $SNAPSHOT_DIR
|
||||
elif [ -d $SNAPSHOT_DIR/$PKG ]; then
|
||||
rm -rf $SNAPSHOT_DIR/$PKG/*
|
||||
fi
|
||||
|
||||
# Copy the tools, of course.
|
||||
# Copy the tools, of course.
|
||||
mkdir -p $SNAPSHOT_DIR/$PKG/bin
|
||||
cp bin/* $SNAPSHOT_DIR/$PKG/bin
|
||||
|
||||
|
@@ -24,7 +24,7 @@ my @required_modules = qw(
|
||||
IO::File
|
||||
List::Util
|
||||
POSIX
|
||||
Socket
|
||||
Socket
|
||||
Test::More
|
||||
Time::HiRes
|
||||
Time::Local
|
||||
@@ -46,7 +46,7 @@ printf $fmt, "Perl", `perl -v | perl -ne '/v([\\d\\.]+)/ && print \$1'`;
|
||||
foreach my $module (@required_modules) {
|
||||
my $version = "NA";
|
||||
eval "require $module";
|
||||
if ( $EVAL_ERROR ) {
|
||||
if ( $EVAL_ERROR ) {
|
||||
$exit_status = 1;
|
||||
}
|
||||
else {
|
||||
@@ -58,7 +58,7 @@ foreach my $module (@required_modules) {
|
||||
foreach my $module (@optional_modules) {
|
||||
my $version = "NA";
|
||||
eval "require $module";
|
||||
if ( !$EVAL_ERROR ) {
|
||||
if ( !$EVAL_ERROR ) {
|
||||
$version = ${"${module}::VERSION"};
|
||||
}
|
||||
printf $fmt, $module, $version;
|
||||
|
@@ -137,7 +137,7 @@ sub parse_options {
|
||||
map { printf $fmt, $opts[$_], $sorted[$_] }
|
||||
grep { $opts[$_] ne $sorted[$_] }
|
||||
($i..$#sorted);
|
||||
last;
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@ sub check_module_usage {
|
||||
. join('', map { "\t$_\n" } @unused);
|
||||
$exit_status = 1;
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -278,7 +278,7 @@ sub check_option_types {
|
||||
# standard filter --columns (e.g. same family as --databases, --tables, etc.)
|
||||
# These exceptions are good candidates for change, so our standard options
|
||||
# really are standard across all tools.
|
||||
my $exception = {
|
||||
my $exception = {
|
||||
'pt-deadlock-logger' => { # not standard filter
|
||||
columns => {
|
||||
type => 'h',
|
||||
@@ -382,7 +382,7 @@ sub check_pod_header_order {
|
||||
map { printf $fmt, ($hdrs[$_] || ''), $std_hdrs[$_] }
|
||||
grep { ($hdrs[$_] || '') ne $std_hdrs[$_] }
|
||||
($i..$#std_hdrs);
|
||||
last;
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -400,7 +400,7 @@ sub check_pod_formatting {
|
||||
}
|
||||
|
||||
chomp(my $podchecker = `which podchecker`);
|
||||
if ( $podchecker ) {
|
||||
if ( $podchecker ) {
|
||||
$output = `$podchecker $tool_file 2>&1`;
|
||||
if ( $output !~ m/pod syntax OK/ ) {
|
||||
$exit_status = 1;
|
||||
|
@@ -18,7 +18,7 @@ BEGIN {
|
||||
exit
|
||||
if ( \$0 ~ /^\$/ )
|
||||
continue
|
||||
|
||||
|
||||
print
|
||||
}
|
||||
}
|
||||
|
@@ -93,7 +93,7 @@ while (my $para = <$in>) {
|
||||
}
|
||||
|
||||
close $in;
|
||||
|
||||
|
||||
if ($nofix) {
|
||||
print $fixed_output;
|
||||
}
|
||||
|
@@ -8,7 +8,7 @@
|
||||
# Standard startup, find the branch's root directory
|
||||
# ############################################################################
|
||||
LANG='en_US.UTF-8'
|
||||
LC_NUMERIC='POSIX'
|
||||
LC_NUMERIC='POSIX'
|
||||
|
||||
die() {
|
||||
echo $1 >&2
|
||||
|
@@ -77,7 +77,7 @@ use warnings FATAL => 'all';
|
||||
# of this so it will not try to load the module from @INC. See the tool's
|
||||
# documentation for a full list of dependencies.
|
||||
BEGIN {
|
||||
\$INC{\$_} = __FILE__ for map { (my \$pkg = \"\$_.pm\") =~ s!::!/!g; \$pkg } (qw("
|
||||
\$INC{\$_} = __FILE__ for map { (my \$pkg = \"\$_.pm\") =~ s!::!/!g; \$pkg } (qw("
|
||||
|
||||
for pkg in $(grep '^package [A-Za-z:]*;' $tool_file | cut -d' ' -f2 | cut -d';' -f1); do
|
||||
echo " $pkg"
|
||||
|
@@ -99,9 +99,9 @@ echo "# ########################################################################
|
||||
# End $pkg package" >> $tmp_file
|
||||
|
||||
tail -n +$pkg_end_line $tool_file >> $tmp_file
|
||||
|
||||
|
||||
mv $tmp_file $tool_file
|
||||
}
|
||||
}
|
||||
|
||||
update_tool_header() {
|
||||
local tool_file=$1
|
||||
|
Reference in New Issue
Block a user