[Pkg-mozext-commits] [adblock-plus] 318/464: Expect the basename metadata entry to be lowercased for consistency

[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 f79dabeecdd9632e9b266c18fb073885e60d7b35
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Tue Oct 30 14:54:59 2012 +0100

    Expect the basename metadata entry to be lowercased for consistency
---
 build.py           | 14 +++++++-------
 packagerChrome.py  |  4 ++--
 packagerGecko.py   |  2 +-
 packagerKMeleon.py |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.py b/build.py
index 3111600..c0ba047 100644
--- a/build.py
+++ b/build.py
@@ -226,11 +226,11 @@ def setupTranslations(baseDir, scriptName, opts, args, type):
     import buildtools.packagerChrome as packager
     locales = os.listdir(os.path.join(baseDir, '_locales'))
     locales = map(lambda locale: locale.replace('_', '-'), locales)
-    basename = packager.readMetadata(baseDir).get('general', 'baseName')
+    basename = packager.readMetadata(baseDir).get('general', 'basename')
   else:
     import buildtools.packagerGecko as packager
     locales = packager.getLocales(baseDir, True)
-    basename = packager.readMetadata(baseDir).get('general', 'baseName')
+    basename = packager.readMetadata(baseDir).get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   localeTools.setupTranslations(type, locales, basename, key)
@@ -248,12 +248,12 @@ def updateTranslationMaster(baseDir, scriptName, opts, args, type):
     import buildtools.packagerChrome as packager
     defaultLocaleDir = os.path.join(baseDir, '_locales', packager.defaultLocale)
     metadata = packager.readMetadata(baseDir)
-    basename = metadata.get('general', 'baseName')
+    basename = metadata.get('general', 'basename')
   else:
     import buildtools.packagerGecko as packager
     defaultLocaleDir = os.path.join(packager.getLocalesDir(baseDir), packager.defaultLocale)
     metadata = packager.readMetadata(baseDir)
-    basename = metadata.get('general', 'baseName')
+    basename = metadata.get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   localeTools.updateTranslationMaster(type, metadata, defaultLocaleDir, basename, key)
@@ -273,14 +273,14 @@ def uploadTranslations(baseDir, scriptName, opts, args, type):
     locales = os.listdir(localesDir)
     locales = map(lambda locale: (locale.replace('_', '-'), os.path.join(localesDir, locale)), locales)
     metadata = packager.readMetadata(baseDir)
-    basename = metadata.get('general', 'baseName')
+    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)
-    basename = metadata.get('general', 'baseName')
+    basename = metadata.get('general', 'basename')
 
   import buildtools.localeTools as localeTools
   for locale, localeDir in locales:
@@ -303,7 +303,7 @@ def getTranslations(baseDir, scriptName, opts, args, type):
     localesDir = packager.getLocalesDir(baseDir)
 
   import buildtools.localeTools as localeTools
-  basename = packager.readMetadata(baseDir).get('general', 'baseName')
+  basename = packager.readMetadata(baseDir).get('general', 'basename')
   localeTools.getTranslations(type, localesDir, packager.defaultLocale.replace('_', '-'), basename, key)
 
 
diff --git a/packagerChrome.py b/packagerChrome.py
index 13f1b9c..ab8f4fe 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -12,7 +12,7 @@ from zipfile import ZipFile, ZIP_DEFLATED
 defaultLocale = 'en_US'
 
 def getDefaultFileName(baseDir, metadata, version, ext):
-  return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'baseName'), version, ext))
+  return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext))
 
 def getMetadataPath(baseDir):
   return os.path.join(baseDir, 'metadata')
@@ -151,7 +151,7 @@ def createBuild(baseDir, outFile=None, buildNum=None, releaseBuild=False, keyFil
       buildNum = getBuildNum(baseDir)
     filters.append(lambda zip, dir, fileName, fileData: addBuildNumber(buildNum, zip, dir, fileName, fileData))
 
-    baseName = metadata.get('general', 'baseName')
+    baseName = metadata.get('general', 'basename')
     updateName = baseName + '-experimental' if experimentalAPI else baseName
     filters.append(lambda zip, dir, fileName, fileData: setUpdateURL(updateName, zip, dir, fileName, fileData))
     if experimentalAPI:
diff --git a/packagerGecko.py b/packagerGecko.py
index 54d27bc..7b0c7c0 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -28,7 +28,7 @@ KNOWN_APPS = {
 defaultLocale = 'en-US'
 
 def getDefaultFileName(baseDir, metadata, version, ext='xpi'):
-  return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'baseName'), version, ext))
+  return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext))
 
 def getMetadataPath(baseDir):
   return os.path.join(baseDir, 'metadata')
diff --git a/packagerKMeleon.py b/packagerKMeleon.py
index c5a60a0..c69dd73 100644
--- a/packagerKMeleon.py
+++ b/packagerKMeleon.py
@@ -141,7 +141,7 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
     'metadata': metadata,
     'limitMetadata': False,
   }
-  baseName = metadata.get('general', 'baseName')
+  baseName = metadata.get('general', 'basename')
 
   chromeFiles = {}
   for xulFile in getXULFiles(baseDir):

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