From b2f99194e2c58d2acd3b89ad0740509830d498786967fa19efb1bbf8c442d24e Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Tue, 27 Jun 2017 11:52:59 +0000
Subject: [PATCH] - fix translation generator script to fail if po files have
 failing   checks rather than silently continuing without translations  
 (boo#1044028)

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-trans?expand=0&rev=252
---
 _service                                   |  6 ++---
 _servicedata                               |  2 +-
 yast2-trans-84.87.20170618.0f9396fd.tar.xz |  3 ---
 yast2-trans-84.87.20170627.4e7fec5c.tar.xz |  3 +++
 yast2-trans.changes                        | 30 ++++++++++++++++++++++
 yast2-trans.spec                           | 20 ++++++++++-----
 6 files changed, 50 insertions(+), 14 deletions(-)
 delete mode 100644 yast2-trans-84.87.20170618.0f9396fd.tar.xz
 create mode 100644 yast2-trans-84.87.20170627.4e7fec5c.tar.xz

diff --git a/_service b/_service
index 6588d2ac..949bcd91 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,5 @@
 <services>
-	<service name="tar_scm" mode="localonly">
+	<service name="tar_scm" mode="disabled">
 		<param name="filename">yast2-trans</param>
 		<param name="versionformat">%cd.%h</param>
 		<!-- it's tumbleweed -->
@@ -9,9 +9,9 @@
 		<param name="changesgenerate">enable</param>
 		<param name="changesauthor">git@opensuse.org</param>
 	</service>
-	<service name="recompress" mode="localonly">
+	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
 		<param name="compression">xz</param>
 	</service>
-	<service name="set_version" mode="localonly"/>
+	<service name="set_version" mode="disabled"/>
 </services>
diff --git a/_servicedata b/_servicedata
index d596879e..969b192d 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/yast/yast-translations.git</param>
-          <param name="changesrevision">0f9396fdf1e97630b69d15e280b7d20ae4607994</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">4e7fec5c23defd94f23b6c0a32223ad174cf77ae</param></service></servicedata>
\ No newline at end of file
diff --git a/yast2-trans-84.87.20170618.0f9396fd.tar.xz b/yast2-trans-84.87.20170618.0f9396fd.tar.xz
deleted file mode 100644
index 45073bcc..00000000
--- a/yast2-trans-84.87.20170618.0f9396fd.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6387b4d6586e3b726a2a260cd1b8e3da43d69e440f266ccffeea274711091fbe
-size 20775412
diff --git a/yast2-trans-84.87.20170627.4e7fec5c.tar.xz b/yast2-trans-84.87.20170627.4e7fec5c.tar.xz
new file mode 100644
index 00000000..62071981
--- /dev/null
+++ b/yast2-trans-84.87.20170627.4e7fec5c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fc0135503bdc07cff7adb7959a13372322f9db0625196ae54ebe69465cacff5
+size 20498000
diff --git a/yast2-trans.changes b/yast2-trans.changes
index 84590bcc..91f75dc2 100644
--- a/yast2-trans.changes
+++ b/yast2-trans.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Tue Jun 27 11:48:58 UTC 2017 - git@opensuse.org
+
+- Update to version 84.87.20170627.4e7fec5c:
+  * New POT for text domain 'country'.
+  * New POT for text domain 'kdump'.
+  * New POT for text domain 'pkg-bindings'.
+  * New POT for text domain 'qt-pkg'.
+  * New POT for text domain 'registration'.
+  * New POT for text domain 'storage'.
+  * Translated using Weblate (Catalan)
+  * Translated using Weblate (Chinese (Taiwan))
+  * Translated using Weblate (Danish)
+  * Translated using Weblate (Dutch)
+  * Translated using Weblate (German)
+  * Translated using Weblate (Italian)
+  * Translated using Weblate (Japanese)
+  * Translated using Weblate (Lithuanian)
+  * Translated using Weblate (Portuguese (Brazil))
+  * Translated using Weblate (Slovak)
+  * Translated using Weblate (Spanish)
+  * Translated using Weblate (Ukrainian)
+
+-------------------------------------------------------------------
+Tue Jun 27 11:40:57 UTC 2017 - lnussel@suse.de
+
+- fix translation generator script to fail if po files have failing
+  checks rather than silently continuing without translations
+  (boo#1044028)
+
 -------------------------------------------------------------------
 Mon Jun 19 08:43:55 UTC 2017 - git@opensuse.org
 
diff --git a/yast2-trans.spec b/yast2-trans.spec
index e9a82cd2..c9e01013 100644
--- a/yast2-trans.spec
+++ b/yast2-trans.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-trans
-Version:        84.87.20170618.0f9396fd
+Version:        84.87.20170627.4e7fec5c
 Release:        0
 Summary:        YaST2 - Translation Container Package
 License:        GPL-2.0+
@@ -699,14 +699,20 @@ for l in %build_languages; do
   mkdir -p $pack_dir
   cp %{S:1} $pack_dir/COPYING
   # touch %%{buildroot}/usr/share/doc/packages/yast2-trans-$l/status.txt
-  {
-    for t in $(find * -maxdepth 1 -type d); do
-      [ -r $t/$l.po ] || continue
-      msgfmt --statistics -o $target_dir/$t.mo $t/$l.po 2>&1
-    done
-  } | bash %{S:2} | head -n 6 \
+  for po in */$l.po; do
+    domain="${po%%/*}"
+    if ! msgfmt --statistics -o $target_dir/$domain.mo $po > out 2>&1; then
+      cat out >> failed
+    fi
+  done | tee $l.txt
+  bash %{S:2} < $l.txt | head -n 6 \
     > %{buildroot}/usr/share/doc/packages/yast2-trans-$l/status.txt
 done
+if [ -s "failed" ]; then
+	echo "## PO FILES WITH FAILED CHECKS ###"
+        cat failed
+	exit 1
+fi
 popd
 
 %clean