[Pkg-mozext-commits] [adblock-plus] 08/22: Issue 2225 - Update buildtools dependency to revision c4590ad32b6e

[David Prévot]

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

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

commit e624b55a168dd3b66e88444a4b29edc37e9e9b76
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Mar 27 21:31:18 2015 +0100

    Issue 2225 - Update buildtools dependency to revision c4590ad32b6e
---
 dependencies           |  2 +-
 ensure_dependencies.py | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dependencies b/dependencies
index 3c8bf5b..041f34d 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:be85e6094718 git:021b78c
+buildtools = buildtools hg:c4590ad32b6e git:81d12c9
 adblockplusui = adblockplusui hg:75a50600e10a git:7ebacdc
diff --git a/ensure_dependencies.py b/ensure_dependencies.py
old mode 100644
new mode 100755
index a6ae401..d8af9e7
--- a/ensure_dependencies.py
+++ b/ensure_dependencies.py
@@ -14,6 +14,7 @@ import errno
 import logging
 import subprocess
 import urlparse
+import argparse
 
 from collections import OrderedDict
 from ConfigParser import RawConfigParser
@@ -186,7 +187,11 @@ def ensure_repo(parentrepo, target, roots, sourcename):
   if type is None:
     raise Exception("No valid source found to create %s" % target)
 
-  url = urlparse.urljoin(roots[type], sourcename)
+  if os.path.exists(roots[type]):
+    url = os.path.join(roots[type], sourcename)
+  else:
+    url = urlparse.urljoin(roots[type], sourcename)
+
   logging.info("Cloning repository %s into %s" % (url, target))
   repo_types[type].clone(url, target)
 
@@ -278,8 +283,17 @@ def _ensure_line_exists(path, pattern):
 
 if __name__ == "__main__":
   logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
-  repos = sys.argv[1:]
+
+  parser = argparse.ArgumentParser(description="Verify dependencies for a set of repositories, by default the repository of this script.")
+  parser.add_argument("repos", metavar="repository", type=str, nargs="*", help="Repository path")
+  parser.add_argument("-q", "--quiet", action="store_true", help="Suppress informational output")
+  args = parser.parse_args()
+
+  if args.quiet:
+    logging.disable(logging.INFO)
+
+  repos = args.repos
   if not len(repos):
-    repos = [os.getcwd()]
+    repos = [os.path.dirname(__file__)]
   for repo in repos:
     resolve_deps(repo)

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