Issue 2121 - Release automation fails to put generated packages into the right directory

packagerSafari.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import re
 import json
 import ConfigParser
@@ skipping 190 matching lines @@
 
     subprocess.check_call(['xar', '--inject-sig', signature_filename, '-f', outFile])
   finally:
     os.unlink(signature_filename)
 
 def createBuild(baseDir, type, outFile=None, buildNum=None, releaseBuild=False, keyFile=None, devenv=False):
   metadata = readMetadata(baseDir, type)
   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,
     'baseDir': baseDir,
     'releaseBuild': releaseBuild,
     'version': version,
     'devenv': devenv,
     'metadata': metadata,
   }
 
@@ skipping 26 matching lines @@
   fixAbsoluteUrls(files)
 
   dirname = metadata.get('general', 'basename') + '.safariextension'
   for filename in files.keys():
     files[os.path.join(dirname, filename)] = files.pop(filename)
 
   if not devenv and keyFile:
     createSignedXarArchive(outFile, files, keyFile)
   else:
     files.zip(outFile)