[Pkg-mozext-commits] [adblock-plus] 31/41: Issue 2121 - Release automation fails to put generated packages into the right directory

[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 77a68d2e9765b1acf6cc2ef8768f97de86ada0af
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Tue Mar 10 20:15:41 2015 +0100

    Issue 2121 - Release automation fails to put generated packages into the right directory
---
 packager.py          |  4 ++--
 packagerChrome.py    |  2 +-
 packagerGecko.py     |  2 +-
 packagerSafari.py    |  2 +-
 releaseAutomation.py | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packager.py b/packager.py
index 4dee3a2..2ba4996 100644
--- a/packager.py
+++ b/packager.py
@@ -13,8 +13,8 @@ from chainedconfigparser import ChainedConfigParser
 
 import buildtools
 
-def getDefaultFileName(baseDir, metadata, version, ext):
-  return os.path.join(baseDir, '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext))
+def getDefaultFileName(metadata, version, ext):
+  return '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext)
 
 def getMetadataPath(baseDir, type):
   return os.path.join(baseDir, 'metadata.%s' % type)
diff --git a/packagerChrome.py b/packagerChrome.py
index 89176f0..9ebf26a 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -321,7 +321,7 @@ def createBuild(baseDir, type='chrome', outFile=None, buildNum=None, releaseBuil
   version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
   if outFile == None:
-    outFile = getDefaultFileName(baseDir, metadata, version, 'crx' if keyFile else 'zip')
+    outFile = getDefaultFileName(metadata, version, 'crx' if keyFile else 'zip')
 
   params = {
     'type': type,
diff --git a/packagerGecko.py b/packagerGecko.py
index c36718a..72ec7ec 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -324,7 +324,7 @@ def createBuild(baseDir, type="gecko", outFile=None, locales=None, buildNum=None
   version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
   if outFile == None:
-    outFile = getDefaultFileName(baseDir, metadata, version, 'xpi')
+    outFile = getDefaultFileName(metadata, version, 'xpi')
 
   contributors = getContributors(metadata)
 
diff --git a/packagerSafari.py b/packagerSafari.py
index e60b5f2..0d1e566 100644
--- a/packagerSafari.py
+++ b/packagerSafari.py
@@ -208,7 +208,7 @@ def createBuild(baseDir, type, outFile=None, buildNum=None, releaseBuild=False,
   version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
 
   if not outFile:
-    outFile = getDefaultFileName(baseDir, metadata, version, 'safariextz' if keyFile else 'zip')
+    outFile = getDefaultFileName(metadata, version, 'safariextz' if keyFile else 'zip')
 
   params = {
     'type': type,
diff --git a/releaseAutomation.py b/releaseAutomation.py
index 969d822..e90af62 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -77,28 +77,28 @@ def run(baseDir, type, version, keyFiles, downloadsRepo):
   if type == "gecko":
     keyFile = keyFiles[0] if keyFiles else None
     metadata = packager.readMetadata(baseDir, type)
-    buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(baseDir, metadata, version, 'xpi'))
+    buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'xpi'))
     packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
     downloads.append(buildPath)
   elif type == "chrome":
     # We actually have to create four different builds for Chrome: signed a unsigned Chrome builds
     # (the latter for Chrome Web Store), a signed Opera build and a signed Safari build.
     metadata = packager.readMetadata(baseDir, type)
-    buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(baseDir, metadata, version, 'crx'))
+    buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(metadata, version, 'crx'))
     packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFiles[0])
     downloads.append(buildPath)
 
-    buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(baseDir, metadata, version, 'zip'))
+    buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(metadata, version, 'zip'))
     packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, releaseBuild=True, keyFile=None)
 
     metadataOpera = packager.readMetadata(baseDir, "opera")
-    buildPathOpera = os.path.join(downloadsRepo, packager.getDefaultFileName(baseDir, metadataOpera, version, 'crx'))
+    buildPathOpera = os.path.join(downloadsRepo, packager.getDefaultFileName(metadataOpera, version, 'crx'))
     packager.createBuild(baseDir, type="opera", outFile=buildPathOpera, releaseBuild=True, keyFile=keyFiles[0])
     downloads.append(buildPathOpera)
 
     import buildtools.packagerSafari as packagerSafari
     metadataSafari = packagerSafari.readMetadata(baseDir, "safari")
-    buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultFileName(baseDir, metadataSafari, version, 'safariextz'))
+    buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultFileName(metadataSafari, version, 'safariextz'))
     packagerSafari.createBuild(baseDir, type="safari", outFile=buildPathSafari, releaseBuild=True, keyFile=keyFiles[1])
     downloads.append(buildPathSafari)
 

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