[Pkg-mozext-commits] [requestpolicy] 48/65: [release] create on-AMO add-on ID for v1+

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit f18952986bc933c2c3110f2b91a82161abef9b63
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Feb 2 00:49:34 2016 +0100

    [release] create on-AMO add-on ID for v1+
---
 Makefile                                                             | 2 +-
 src/content/lib/utils/constants.jsm                                  | 2 +-
 src/content/main/requestpolicy-service.jsm                           | 5 ++++-
 .../tests/addon_install_and_upgrade/test_multiple_installations.py   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5fe484e..9d60e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PREPROCESS := /usr/bin/preprocess --content-types-path build/preprocess-content-
 #-------------------------------------------------------------------------------
 
 extension_name        := requestpolicy
-amo__extension_id     := rpcontinued at requestpolicy.org
+amo__extension_id     := rpcontinued at amo.requestpolicy.org
 off_amo__extension_id := rpcontinued at non-amo.requestpolicy.org
 
 #-------------------------------------------------------------------------------
diff --git a/src/content/lib/utils/constants.jsm b/src/content/lib/utils/constants.jsm
index 7d881a6..729dfe5 100644
--- a/src/content/lib/utils/constants.jsm
+++ b/src/content/lib/utils/constants.jsm
@@ -30,7 +30,7 @@ this.EXPORTED_SYMBOLS = ["C"];
 var C = {};
 
 // #ifdef AMO
-C.EXTENSION_ID = "rpcontinued at requestpolicy.org";
+C.EXTENSION_ID = "rpcontinued at amo.requestpolicy.org";
 // #else
 C.EXTENSION_ID = "rpcontinued at non-amo.requestpolicy.org";
 // #endif
diff --git a/src/content/main/requestpolicy-service.jsm b/src/content/main/requestpolicy-service.jsm
index 23f54b7..261cdb0 100644
--- a/src/content/main/requestpolicy-service.jsm
+++ b/src/content/main/requestpolicy-service.jsm
@@ -135,13 +135,16 @@ var rpService = (function() {
 
     // The other extension IDs of RequestPolicy.
     var addonIDs = Object.freeze([
+      // Detect the "original" add-on (v0.5; released on AMO).
       "requestpolicy at requestpolicy.com",
+      // Detect "RPC Legacy" (v0.5; AMO version).
+      "rpcontinued at requestpolicy.org",
       // #ifdef AMO
       // In the AMO version the non-AMO version needs to be detected.
       "rpcontinued at non-amo.requestpolicy.org",
       // #else
       // In the non-AMO version the AMO version needs to be detected.
-      "rpcontinued at requestpolicy.org",
+      "rpcontinued at amo.requestpolicy.org",
       // #endif
     ]);
 
diff --git a/tests/marionette/tests/addon_install_and_upgrade/test_multiple_installations.py b/tests/marionette/tests/addon_install_and_upgrade/test_multiple_installations.py
index 9b144ec..a0e1f5f 100644
--- a/tests/marionette/tests/addon_install_and_upgrade/test_multiple_installations.py
+++ b/tests/marionette/tests/addon_install_and_upgrade/test_multiple_installations.py
@@ -11,7 +11,7 @@ from marionette_driver.errors import NoSuchElementException
 RP_BETA_9 = {"id": "requestpolicy at requestpolicy.com",
              "xpi": "requestpolicy-v1.0.beta9.3__preprocess.py.xpi"}
 # AMO version
-RP_AMO = {"id": "rpcontinued at requestpolicy.org",
+RP_AMO = {"id": "rpcontinued at amo.requestpolicy.org",
           "xpi": "requestpolicy-amo.xpi"}
 
 NOTICE_URL = "chrome://rpcontinued/content/multiple-installations.html"

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