From 18275980f098f3996485a7202866caafc48e7ef9 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sun, 7 Apr 2013 20:35:43 -0700
Subject: [PATCH] Check find's output in Jenkins' translation scripts.

* modules/jenkins/files/slave_scripts/propose_translation_update.sh:
Instead of evaluating find's output in test treat finds output as a
string and check if that string is null to determine if find found any
.po files. This is a more reliable way to check for the presence of .po
files as it does not result in confusing test.

* modules/jenkins/files/slave_scripts/upstream_translation_update.sh:
Instead of evaluating find's output in test treat finds output as a
string and check if that string is null to determine if find found any
.po files. This is a more reliable way to check for the presence of .po
files as it does not result in confusing test.

Change-Id: I53f7cc47e3762e4529eaf72f457852e650413b16
Reviewed-on: https://review.openstack.org/26346
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 .../jenkins/files/slave_scripts/propose_translation_update.sh  | 3 ++-
 .../jenkins/files/slave_scripts/upstream_translation_update.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/jenkins/files/slave_scripts/propose_translation_update.sh b/modules/jenkins/files/slave_scripts/propose_translation_update.sh
index a2f9356882..d112af897e 100755
--- a/modules/jenkins/files/slave_scripts/propose_translation_update.sh
+++ b/modules/jenkins/files/slave_scripts/propose_translation_update.sh
@@ -35,7 +35,8 @@ tx set --auto-local -r ${PROJECT}.${PROJECT}-translations "${PROJECT}/locale/<la
 tx pull -a
 # Update the .pot file
 python setup.py extract_messages
-if [ find ${PROJECT}/locale -name '*.po' ]
+PO_FILES=`find ${PROJECT}/locale -name '*.po'`
+if [ -n "$PO_FILES" ]
 then
     # Use updated .pot file to update translations
     python setup.py update_catalog
diff --git a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh
index 2b6cd8feaa..2f2b56cb4d 100755
--- a/modules/jenkins/files/slave_scripts/upstream_translation_update.sh
+++ b/modules/jenkins/files/slave_scripts/upstream_translation_update.sh
@@ -18,7 +18,8 @@ tx set --auto-local -r ${PROJECT}.${PROJECT}-translations "${PROJECT}/locale/<la
 tx pull -a
 # Update the .pot file
 python setup.py extract_messages
-if [ find ${PROJECT}/locale -name '*.po' ]
+PO_FILES=`find ${PROJECT}/locale -name '*.po'`
+if [ -n "$PO_FILES" ]
 then
     # Use updated .pot file to update translations
     python setup.py update_catalog