From fcc53182f06d79a0f33cb62ee7936642b41954c0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 15 Apr 2014 08:57:34 +0200 Subject: [PATCH] Propose translation update: Handle PO-Revision-Date Include PO-Revision-Date in list of lines to ignore so that we do not get new proposed files where just the date has changed. Change-Id: I3ce13d0cdd9fdbf1711d40ebbdef408c93d49523 --- .../files/slave_scripts/propose_translation_update.sh | 7 ++++--- .../slave_scripts/propose_translation_update_manuals.sh | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh index 065cb180f4..e8fcd026c3 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh @@ -59,11 +59,12 @@ fi # Add all changed files to git git add $PROJECT/locale/* -# Don't send files where the only things that have changed are the -# creation date, the version number or comment lines. +# Don't send files where the only things which have changed are the +# creation date, the version number, the revision date, or comment +# lines. for f in `git diff --cached --name-only` 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 git reset -q $f git checkout -- $f diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh index 0e39dc7ced..6605341788 100755 --- a/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh +++ b/modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh @@ -95,10 +95,11 @@ do done # 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` 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 git reset -q $f git checkout -- $f