[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kajongg] src: winprep.py: adapt to changed KDE paths
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2016-12-03 9:17:41
Message-ID: E1cD6Rx-0002UT-0I () code ! kde ! org
[Download RAW message or body]

Git commit c859ac77d20f7c961c2987e3b2a1a529f966ab1c by Wolfgang Rohdewald.
Committed on 03/12/2016 at 09:16.
Pushed by wrohdewald into branch 'master'.

winprep.py: adapt to changed KDE paths

M  +24   -16   src/winprep.py

https://commits.kde.org/kajongg/c859ac77d20f7c961c2987e3b2a1a529f966ab1c

diff --git a/src/winprep.py b/src/winprep.py
index c147d45..7bf0c2b 100644
--- a/src/winprep.py
+++ b/src/winprep.py
@@ -25,7 +25,7 @@ block that might have to be adapted.
 
 from __future__ import print_function
 
-from subprocess import check_output, call
+from subprocess import check_output, call, CalledProcessError
 from shutil import copy, move, copytree, rmtree
 
 import os
@@ -136,18 +136,26 @@ languages = (
 for lang in languages:
     print('getting language', lang)
     os.makedirs(DEST + '/locale/{}/LC_MESSAGES'.format(lang))
-    for directory, filename in (
-            ('kdegames', 'kajongg'), ('kdegames', 'libkmahjongg'),
-            ('kdelibs', 'kdelibs4'), ('qt', 'kdeqt')):
-        mo_data = check_output(
-            'svn cat svn://anonsvn.kde.org/home/kde/'
-            'trunk/l10n-kde4/{}/messages/{}/{}.po'.format(
-                lang, directory, filename).split())
-        with open('x.po', 'wb') as outfile:
-            outfile.write(mo_data)
-        call(
-            'msgfmt x.po -o {}/locale/{}/LC_MESSAGES/{}.mo'.format(
-                DEST,
-                lang,
-                filename).split())
-        os.remove('x.po')
+    DEVNULL = open(os.devnull, 'wb')
+    for kde45 in ('l10n-kde4', 'l10n-kf5'):
+        for filename in (
+                'kdegames/kajongg', 'kdegames/libkmahjongg',
+                'kdegames/libkmahjongg5',
+                'kdegames/desktop_kdegames_libkmahjongg',
+                'kdelibs/kdelibs4', 'qt/kdeqt'):
+            try:
+                mo_data = check_output(
+                    'svn cat svn://anonsvn.kde.org/home/kde/'
+                    'trunk/{}/{}/messages/{}.po'.format(
+                        kde45, lang, filename).split(), stderr=DEVNULL)
+                print('found:', lang, kde45, filename)
+                with open('x.po', 'wb') as outfile:
+                    outfile.write(mo_data)
+                call(
+                    'msgfmt x.po -o {}/locale/{}/LC_MESSAGES/{}.mo'.format(
+                        DEST,
+                        lang,
+                        filename.split('/')[1]).split())
+                os.remove('x.po')
+            except CalledProcessError:
+                pass

[prev in list] [next in list] [prev in thread] [next in thread]