Issue 6383 - introduce switchable app_id

packager.py

 # 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/.
 
 # Note: These are the base functions common to all packagers, the actual
 # packagers are implemented in packagerChrome and packagerEdge.
 
 import sys
 import os
 import re
@@ skipping 22 matching lines @@
     try:
         if has_key_file:
             key = 'signed'
         else:
             key = 'unsigned'
         extension = extension[key]
     except (KeyError, TypeError):
         pass
 
     return extension
+
+
+def get_app_id(release_build, metadata):
+    """Lookup the correct app_id for a build."""
+    suffix = 'release' if release_build else 'devbuild'
+    app_id_option = 'app_id_' + suffix
+
+    return metadata.get('general', app_id_option)
 
 
 def getMetadataPath(baseDir, type):
     return os.path.join(baseDir, 'metadata.%s' % type)
 
 
 def getDevEnvPath(baseDir, type):
     return os.path.join(baseDir, 'devenv.' + type)
 
 
@@ skipping 103 matching lines @@
 
     def zip(self, outFile, sortKey=None, compression=zipfile.ZIP_DEFLATED):
         with zipfile.ZipFile(outFile, 'w', compression) as zf:
             for name in sorted(self, key=sortKey):
                 zf.writestr(name, self[name])
 
     def zipToString(self, sortKey=None):
         buffer = StringIO()
         self.zip(buffer, sortKey=sortKey)
         return buffer.getvalue()