[Pkg-mozext-commits] [adblock-plus] 160/464: K-Meleon: Allow local metadata to override data from base extension

[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 4a649c231e7a4a0d41ce5982476391ce4ff35956
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri May 20 15:54:05 2011 +0200

    K-Meleon: Allow local metadata to override data from base extension
---
 packagerKMeleon.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packagerKMeleon.py b/packagerKMeleon.py
index 3584371..3d8bbc8 100644
--- a/packagerKMeleon.py
+++ b/packagerKMeleon.py
@@ -134,9 +134,6 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
   if not releaseBuild:
     version += '.' + buildNum
 
-  if outFile == None:
-    outFile = packager.getDefaultFileName(baseDir, metadata, version, 'zip')
-
   params = {
     'locales': locales,
     'releaseBuild': releaseBuild,
@@ -179,4 +176,9 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
     newFiles[key] = value
   files = newFiles
 
+  # Allow local metadata to overrite settings from base extension
+  metadata.read(packager.getMetadataPath(baseDir))
+  if outFile == None:
+    outFile = packager.getDefaultFileName(baseDir, metadata, version, 'zip')
+
   packager.writeXPI(files, outFile)

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