Merge 2.1.8 and 2.2.

This commit is contained in:
Daniel Nichter
2013-02-05 10:22:31 -07:00
135 changed files with 2653 additions and 1103 deletions

View File

@@ -181,7 +181,7 @@ update_copyright_year() {
echo -n "Updating copyright year in tools... "
cd $BRANCH/bin
for tool_file in *; do
local copyright="$(grep "[0-9] Percona Inc." $tool_file)"
local copyright="$(grep "[0-9] Percona Ireland Ltd" $tool_file)"
local new_copyright="$(../util/new-copyright-year "$YEAR" "$copyright")"
if [ $? -ne 0 ]; then
die "Error parsing copyright year in $tool_file"
@@ -196,7 +196,7 @@ update_copyright_year() {
echo -n "Updating copyright year in percona-toolkit.pod... "
local pod=$DOCS_DIR/percona-toolkit.pod
local copyright="$(grep "[0-9] Percona Inc." $pod)"
local copyright="$(grep "[0-9] Percona Ireland Ltd" $pod)"
local new_copyright="$(../util/new-copyright-year "$YEAR" "$copyright")"
if [ $? -ne 0 ]; then
die "Error parsing copyright year in percona-toolkit.pod"

View File

@@ -190,13 +190,13 @@ if [ $pkgs_updated -gt 0 ]; then
fi
if [ $EXIT_STATUS -eq 0 ]; then
cp $tmp_tool_file $tool_file
EXIT_STATUS=$((EXIT_STATUS | $?))
if [ $? -ne 0 ]; then
warn "Failed to copy $tmp_tool_file to $tool_file"
else
rm $tmp_tool_file > /dev/null
EXIT_STATUS=$((EXIT_STATUS | $?))
fi
fi
fi
[ -f "$tmp_tool_file" ] && rm $tmp_tool_file
exit $EXIT_STATUS