[Pkg-mozext-commits] [adblock-plus] 13/74: Issue 2438 - Update buildtools dependency to revision 97e212af6e8

David Prévot taffit at moszumanska.debian.org
Tue Aug 11 12:07:05 UTC 2015


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

taffit pushed a commit to branch master
in repository adblock-plus.

commit ad67ff7819cf1ad9a0d18578252f2e3dd9c1e6c3
Author: Felix Dahlke <felix at adblockplus.org>
Date:   Mon May 4 21:06:03 2015 +0200

    Issue 2438 - Update buildtools dependency to revision 97e212af6e8
---
 defaults/prefs.js      | 39 ---------------------------------------
 defaults/prefs.json    | 41 +++++++++++++++++++++++++++++++++++++++++
 dependencies           |  2 +-
 ensure_dependencies.py | 19 ++++++++++++++++---
 4 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/defaults/prefs.js b/defaults/prefs.js
deleted file mode 100644
index 655f714..0000000
--- a/defaults/prefs.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// For description of these values see http://adblockplus.org/en/preferences
-
-pref("extensions.adblockplus.currentVersion", "0.0");
-pref("extensions.adblockplus.enabled", true);
-pref("extensions.adblockplus.frameobjects", true);
-pref("extensions.adblockplus.fastcollapse", false);
-pref("extensions.adblockplus.showinstatusbar", false);
-pref("extensions.adblockplus.detachsidebar", false);
-pref("extensions.adblockplus.defaulttoolbaraction", 0);
-pref("extensions.adblockplus.defaultstatusbaraction", 0);
-pref("extensions.adblockplus.sidebar_key", "Accel Shift V, Accel Shift U");
-pref("extensions.adblockplus.sendReport_key", "");
-pref("extensions.adblockplus.filters_key", "Accel Shift E, Accel Shift F, Accel Shift O");
-pref("extensions.adblockplus.enable_key", "");
-pref("extensions.adblockplus.flash_scrolltoitem", true);
-pref("extensions.adblockplus.previewimages", true);
-pref("extensions.adblockplus.data_directory", "adblockplus");
-pref("extensions.adblockplus.patternsbackups", 5);
-pref("extensions.adblockplus.patternsbackupinterval", 24);
-pref("extensions.adblockplus.whitelistschemes", "about chrome file irc moz-safe-about news resource snews x-jsd addbook cid imap mailbox nntp pop data javascript moz-icon");
-pref("extensions.adblockplus.subscriptions_autoupdate", true);
-pref("extensions.adblockplus.subscriptions_listurl", "https://adblockplus.org/subscriptions2.xml");
-pref("extensions.adblockplus.subscriptions_fallbackurl", "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%");
-pref("extensions.adblockplus.subscriptions_fallbackerrors", 5);
-pref("extensions.adblockplus.subscriptions_exceptionsurl", "https://easylist-downloads.adblockplus.org/exceptionrules.txt");
-pref("extensions.adblockplus.subscriptions_exceptionscheckbox", true);
-pref("extensions.adblockplus.documentation_link", "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%");
-pref("extensions.adblockplus.savestats", true);
-pref("extensions.adblockplus.composer_default", 2);
-pref("extensions.adblockplus.clearStatsOnHistoryPurge", true);
-pref("extensions.adblockplus.report_submiturl", "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%");
-pref("extensions.adblockplus.recentReports", []);
-pref("extensions.adblockplus.hideContributeButton", false);
-pref("extensions.adblockplus.blockableItemsSize", {width: 200, height: 200});
-pref("extensions.adblockplus.notificationurl", "https://notification.adblockplus.org/notification.json");
-pref("extensions.adblockplus.notificationdata", {});
-pref("extensions.adblockplus.subscriptions_antiadblockurl", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt");
-pref("extensions.adblockplus.please_kill_startup_performance", false);
-pref("extensions.adblockplus.suppress_first_run_page", false);
diff --git a/defaults/prefs.json b/defaults/prefs.json
new file mode 100644
index 0000000..bde9c90
--- /dev/null
+++ b/defaults/prefs.json
@@ -0,0 +1,41 @@
+{
+  "defaults": {
+    "currentVersion": "0.0",
+    "enabled": true,
+    "frameobjects": true,
+    "fastcollapse": false,
+    "showinstatusbar": false,
+    "detachsidebar": false,
+    "defaulttoolbaraction": 0,
+    "defaultstatusbaraction": 0,
+    "sidebar_key": "Accel Shift V, Accel Shift U",
+    "sendReport_key": "",
+    "filters_key": "Accel Shift E, Accel Shift F, Accel Shift O",
+    "enable_key": "",
+    "flash_scrolltoitem": true,
+    "previewimages": true,
+    "data_directory": "adblockplus",
+    "patternsbackups": 5,
+    "patternsbackupinterval": 24,
+    "whitelistschemes": "about chrome file irc moz-safe-about news resource snews x-jsd addbook cid imap mailbox nntp pop data javascript moz-icon",
+    "subscriptions_autoupdate": true,
+    "subscriptions_listurl": "https://adblockplus.org/subscriptions2.xml",
+    "subscriptions_fallbackurl": "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%",
+    "subscriptions_fallbackerrors": 5,
+    "subscriptions_exceptionsurl": "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
+    "subscriptions_exceptionscheckbox": true,
+    "documentation_link": "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%",
+    "savestats": true,
+    "composer_default": 2,
+    "clearStatsOnHistoryPurge": true,
+    "report_submiturl": "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%",
+    "recentReports": [],
+    "hideContributeButton": false,
+    "blockableItemsSize": {"width": 200, "height": 200},
+    "notificationurl": "https://notification.adblockplus.org/notification.json",
+    "notificationdata": {},
+    "subscriptions_antiadblockurl": "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
+    "please_kill_startup_performance": false,
+    "suppress_first_run_page": false
+  }
+}
diff --git a/dependencies b/dependencies
index 8b03e9f..f554b25 100644
--- a/dependencies
+++ b/dependencies
@@ -1,4 +1,4 @@
 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
 _self = buildtools/ensure_dependencies.py
-buildtools = buildtools hg:335c8a7ab8e8 git:687bb17
+buildtools = buildtools hg:97e2e12af6e8 git:ef69bbc
 adblockplusui = adblockplusui hg:75a50600e10a git:7ebacdc
diff --git a/ensure_dependencies.py b/ensure_dependencies.py
index d8af9e7..b6557d0 100755
--- a/ensure_dependencies.py
+++ b/ensure_dependencies.py
@@ -79,6 +79,9 @@ class Mercurial():
       module = os.path.relpath(target, repo)
       _ensure_line_exists(ignore_path, module)
 
+  def postprocess_url(self, url):
+    return url
+
 class Git():
   def istype(self, repodir):
     return os.path.exists(os.path.join(repodir, ".git"))
@@ -104,6 +107,12 @@ class Git():
     exclude_file = os.path.join(repo, ".git", "info", "exclude")
     _ensure_line_exists(exclude_file, module)
 
+  def postprocess_url(self, url):
+    # Handle alternative syntax of SSH URLS
+    if "@" in url and ":" in url and not urlparse.urlsplit(url).scheme:
+      return "ssh://" + url.replace(":", "/", 1)
+    return url
+
 repo_types = OrderedDict((
   ("hg", Mercurial()),
   ("git", Git()),
@@ -187,10 +196,14 @@ def ensure_repo(parentrepo, target, roots, sourcename):
   if type is None:
     raise Exception("No valid source found to create %s" % target)
 
-  if os.path.exists(roots[type]):
-    url = os.path.join(roots[type], sourcename)
+  postprocess_url = repo_types[type].postprocess_url
+  root = postprocess_url(roots[type])
+  sourcename = postprocess_url(sourcename)
+
+  if os.path.exists(root):
+    url = os.path.join(root, sourcename)
   else:
-    url = urlparse.urljoin(roots[type], sourcename)
+    url = urlparse.urljoin(root, sourcename)
 
   logging.info("Cloning repository %s into %s" % (url, target))
   repo_types[type].clone(url, target)

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



More information about the Pkg-mozext-commits mailing list