Merge branch 'anyAllJSON' into next

Conflicts:
	lib/libbugzilla.js

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js
index 9300c49..6d556a4 100644
--- a/lib/libbugzilla.js
+++ b/lib/libbugzilla.js
@@ -61,7 +61,7 @@ function getRealBugNoSlow(bugNo, location, callback) {
         onComplete: function(response) {
             if (response.status === 200) {
                 var xmlRepr = parseXMLfromString(response.text);
-                // TODO this is probably wrong, both XPath and .text attribute
+                // TODO this probably wrong, both XPath and .text attribute
                 var bugID = parseInt(xmlRepr.bug.bug_id.text, 10);
                 if (isNaN(bugID)) {
                     throw new Error("Cannot get bug no. even from XML representation!");
@@ -85,7 +85,7 @@ function getPassword(login, domain) {
         withoutPass: false // whether user doesn't want to use password at all
     };
 
-    // pass === null means no appropriatjslie password in the storage
+    // pass === null means no appropriate password in the storage
     if (!preferences.get(prefName,false) && (pass === null)) {
         var passwordText = prompts.promptPassword(passPrompt);
         if (passwordText && passwordText.length > 0) {
@@ -148,11 +148,10 @@ exports.getInstalledPackages = function getInstalledPackages(locationLoginObj, c
             }
         }
 
-        if ((enabledPackages.length === 1) && (enabledPackages[0] === "all")) {
-            enabledPackages = [];
-            for (var key in config.gJSONData.commentPackages) {
-                enabledPackages.push(key);
-            }
+        var allIdx = null;
+        if ((allIdx = enabledPackages.indexOf("all")) != -1) {
+            enabledPackages = enabledPackages.splice(allIdx,
+                config.gJSONData.commentPackages.keys());
         }
 
         // TODO To be decided, whether we cannot just eliminate packages in