opendev/system-config
Code Issues Proposed changes

Merge "Propose translation update: Handle PO-Revision-Date"

Browse Source
This commit is contained in:
Jenkins 2014-04-15 17:17:47 +00:00 committed by Gerrit Code Review
commit fdddcd6b97
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/jenkins/files/slave_scripts/propose_translation_update.sh
View File

@ -59,11 +59,12 @@ fi
# Add all changed files to git # Add all changed files to git
git add $PROJECT/locale/* git add $PROJECT/locale/*
# Don't send files where the only things that have changed are the # Don't send files where the only things which have changed are the
# creation date, the version number or comment lines. # creation date, the version number, the revision date, or comment
# lines.
for f in `git diff --cached --name-only` for f in `git diff --cached --name-only`
do do
if [ `git diff --cached $f |egrep -v "(POT-Creation-Date|Project-Id-Version|^\+{3}|^\-{3}|^[-+]#)" | egrep -c "^[\-\+]"` -eq 0 ] if [ `git diff --cached $f |egrep -v "(POT-Creation-Date|Project-Id-Version|PO-Revision-Date|^\+{3}|^\-{3}|^[-+]#)" | egrep -c "^[\-\+]"` -eq 0 ]
then then
git reset -q $f git reset -q $f
git checkout -- $f git checkout -- $f

5
modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh
View File

@ -95,10 +95,11 @@ do
done done
# Don't send files where the only things which have changed are the # Don't send files where the only things which have changed are the
# creation date, the version number or comment lines. # creation date, the version number, the revision date, or comment
# lines.
for f in `git diff --cached --name-only` for f in `git diff --cached --name-only`
do do
if [ `git diff --cached $f |egrep -v "(POT-Creation-Date|Project-Id-Version|^\+{3}|^\-{3}|^[-+]#)" | egrep -c "^[\-\+]"` -eq 0 ] if [ `git diff --cached $f |egrep -v "(POT-Creation-Date|Project-Id-Version|PO-Revision-Date|^\+{3}|^\-{3}|^[-+]#)" | egrep -c "^[\-\+]"` -eq 0 ]
then then
git reset -q $f git reset -q $f
git checkout -- $f git checkout -- $f