Issue 6037 - Allow popup icons without popup

packagerChrome.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/.
 
 import errno
 import glob
 import io
 import json
 import os
 import re
@@ skipping 68 matching lines @@
         if not metadata.has_option('general', opt):
             continue
 
         icons = metadata.get('general', opt).split()
         if not icons:
             continue
 
         if len(icons) == 1:
             # ... = icon.png
             icon, popup = icons[0], None
-        elif len(icons) == 2:
-            # ... = icon.png popup.html
-            icon, popup = icons
+        elif icons[-1].endswith('.html'):
+            if len(icons) == 2:
+                # ... = icon.png popup.html
+                icon, popup = icons
+            else:
+                # ... = icon-19.png icon-38.png popup.html
+                popup = icons.pop()
+                icon = makeIcons(files, icons)
         else:
-            # ... = icon-19.png icon-38.png popup.html
-            popup = icons.pop()
+            # ... = icon-16.png icon-32.png icon-48.png
             icon = makeIcons(files, icons)
+            popup = None
 
         templateData[opt] = {'icon': icon, 'popup': popup}
 
     if metadata.has_option('general', 'icons'):
         templateData['icons'] = makeIcons(files,
                                           metadata.get('general', 'icons').split())
 
     if metadata.has_option('general', 'permissions'):
         templateData['permissions'] = metadata.get('general', 'permissions').split()
 
@@ skipping 286 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)