Merge "Handle "No changes" in translation scripts"
This commit is contained in:
commit
b5338c2202
@ -193,6 +193,9 @@ EOF
|
|||||||
# Propose patch using COMMIT_MSG
|
# Propose patch using COMMIT_MSG
|
||||||
function send_patch {
|
function send_patch {
|
||||||
local branch=${1:-master}
|
local branch=${1:-master}
|
||||||
|
local output
|
||||||
|
local ret
|
||||||
|
local success=0
|
||||||
|
|
||||||
# We don't have any repos storing zanata.xml, so just remove it.
|
# We don't have any repos storing zanata.xml, so just remove it.
|
||||||
rm -f zanata.xml
|
rm -f zanata.xml
|
||||||
@ -203,11 +206,17 @@ function send_patch {
|
|||||||
git commit -F- <<EOF
|
git commit -F- <<EOF
|
||||||
$COMMIT_MSG
|
$COMMIT_MSG
|
||||||
EOF
|
EOF
|
||||||
|
# Do error checking manually to ignore one class of failure.
|
||||||
|
set +e
|
||||||
# We cannot rely on the default branch in .gitreview being
|
# We cannot rely on the default branch in .gitreview being
|
||||||
# correct so we are very explicit here.
|
# correct so we are very explicit here.
|
||||||
git review -t zanata/translations $branch
|
output=$(git review -t zanata/translations $branch)
|
||||||
|
ret=$?
|
||||||
|
[[ "$ret" -eq "0" || "$output" =~ "No changes between prior commit" ]]
|
||||||
|
success=$?
|
||||||
|
set -e
|
||||||
fi
|
fi
|
||||||
|
return $success
|
||||||
}
|
}
|
||||||
|
|
||||||
# Setup global variables LEVELS and LKEYWORDS
|
# Setup global variables LEVELS and LKEYWORDS
|
||||||
|
Loading…
Reference in New Issue
Block a user