[Pkg-mozext-commits] [adblock-plus] 55/98: Issue 4589 - Update buildtools dependency to revision dadad687f607

[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 588afd0106f564d51de881ce96a402e07253c554
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Oct 31 15:12:23 2016 +0100

    Issue 4589 - Update buildtools dependency to revision dadad687f607
---
 dependencies           |  2 +-
 ensure_dependencies.py | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dependencies b/dependencies
index c076838..72bc2ed 100644
--- a/dependencies
+++ b/dependencies
@@ -1,5 +1,5 @@
 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
 _self = buildtools/ensure_dependencies.py
-buildtools = buildtools hg:1055332acedc git:9ff219a
+buildtools = buildtools hg:dadad687f607 git:c5d65cb
 adblockpluscore = adblockpluscore hg:1aa19da44dce git:18e21b7
 adblockplusui = adblockplusui hg:253faf3ccf79 git:ebc5d8a
diff --git a/ensure_dependencies.py b/ensure_dependencies.py
index c03069d..b5231e4 100755
--- a/ensure_dependencies.py
+++ b/ensure_dependencies.py
@@ -70,24 +70,22 @@ class Mercurial():
         subprocess.check_call(['hg', 'update', '--repository', repo, '--quiet', '--check', '--rev', rev])
 
     def ignore(self, target, repo):
+        config_path = os.path.join(repo, '.hg', 'hgrc')
+        ignore_file = os.path.join('.hg', 'dependencies')
+        ignore_path = os.path.join(repo, ignore_file)
 
-        if not self.istype(target):
+        config = RawConfigParser()
+        config.read(config_path)
 
-            config_path = os.path.join(repo, '.hg', 'hgrc')
-            ignore_path = os.path.abspath(os.path.join(repo, '.hg', 'dependencies'))
+        if not config.has_section('ui'):
+            config.add_section('ui')
 
-            config = RawConfigParser()
-            config.read(config_path)
+        config.set('ui', 'ignore.dependencies', ignore_file)
+        with open(config_path, 'w') as stream:
+            config.write(stream)
 
-            if not config.has_section('ui'):
-                config.add_section('ui')
-
-            config.set('ui', 'ignore.dependencies', ignore_path)
-            with open(config_path, 'w') as stream:
-                config.write(stream)
-
-            module = os.path.relpath(target, repo)
-            _ensure_line_exists(ignore_path, module)
+        module = os.path.relpath(target, repo)
+        _ensure_line_exists(ignore_path, module)
 
     def postprocess_url(self, url):
         return url

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