[Pkg-mozext-commits] [adblock-plus] 32/41: Issue 2109 - Drop assumption that metadata format depends on platform

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 50468e16c854a60a276f8b5e67423f12667139ff
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Mar 9 20:33:56 2015 +0100

    Issue 2109 - Drop assumption that metadata format depends on platform
---
 build.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/build.py b/build.py
index 51a0ed6..ad3dfa0 100644
--- a/build.py
+++ b/build.py
@@ -242,15 +242,17 @@ def setupTranslations(baseDir, scriptName, opts, args, type):
 
   key = args[0]
 
+  from buildtools.packager import readMetadata
+  metadata = readMetadata(baseDir, type)
+  basename = metadata.get('general', 'basename')
+
   if type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
     locales = os.listdir(os.path.join(baseDir, '_locales'))
     locales = map(lambda locale: locale.replace('_', '-'), locales)
-    basename = packager.readMetadata(baseDir, type).get('general', 'basename')
   else:
     import buildtools.packagerGecko as packager
     locales = packager.getLocales(baseDir, True)
-    basename = packager.readMetadata(baseDir, type).get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   localeTools.setupTranslations(type, locales, basename, key)
@@ -264,16 +266,16 @@ def updateTranslationMaster(baseDir, scriptName, opts, args, type):
 
   key = args[0]
 
+  from buildtools.packager import readMetadata
+  metadata = readMetadata(baseDir, type)
+  basename = metadata.get('general', 'basename')
+
   if type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
     defaultLocaleDir = os.path.join(baseDir, '_locales', packager.defaultLocale)
-    metadata = packager.readMetadata(baseDir, type)
-    basename = metadata.get('general', 'basename')
   else:
     import buildtools.packagerGecko as packager
     defaultLocaleDir = os.path.join(packager.getLocalesDir(baseDir), packager.defaultLocale)
-    metadata = packager.readMetadata(baseDir, type)
-    basename = metadata.get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   localeTools.updateTranslationMaster(type, metadata, defaultLocaleDir, basename, key)
@@ -287,20 +289,20 @@ def uploadTranslations(baseDir, scriptName, opts, args, type):
 
   key = args[0]
 
+  from buildtools.packager import readMetadata
+  metadata = readMetadata(baseDir, type)
+  basename = metadata.get('general', 'basename')
+
   if type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
     localesDir = os.path.join(baseDir, '_locales')
     locales = os.listdir(localesDir)
     locales = map(lambda locale: (locale.replace('_', '-'), os.path.join(localesDir, locale)), locales)
-    metadata = packager.readMetadata(baseDir, type)
-    basename = metadata.get('general', 'basename')
   else:
     import buildtools.packagerGecko as packager
     localesDir = packager.getLocalesDir(baseDir)
     locales = packager.getLocales(baseDir, True)
     locales = map(lambda locale: (locale, os.path.join(localesDir, locale)), locales)
-    metadata = packager.readMetadata(baseDir, type)
-    basename = metadata.get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   for locale, localeDir in locales:
@@ -314,6 +316,10 @@ def getTranslations(baseDir, scriptName, opts, args, type):
     usage(scriptName, type, 'translate')
     return
 
+  from buildtools.packager import readMetadata
+  metadata = readMetadata(baseDir, type)
+  basename = metadata.get('general', 'basename')
+
   key = args[0]
   if type == 'chrome' or type == 'opera':
     import buildtools.packagerChrome as packager
@@ -323,7 +329,6 @@ def getTranslations(baseDir, scriptName, opts, args, type):
     localesDir = packager.getLocalesDir(baseDir)
 
   import buildtools.localeTools as localeTools
-  basename = packager.readMetadata(baseDir, type).get('general', 'basename')
   localeTools.getTranslations(type, localesDir, packager.defaultLocale.replace('_', '-'), basename, key)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git