| OLD | NEW |
| 1 # coding: utf-8 | |
| 2 | |
| 3 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, |
| 4 # Copyright (C) 2006-2016 Eyeo GmbH | 2 # Copyright (C) 2006-2016 Eyeo GmbH |
| 5 # | 3 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. |
| 9 # | 7 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, |
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 if option.endswith("_repository"): | 53 if option.endswith("_repository"): |
| 56 source_repos[re.sub(r"_repository$", "", option)] = MercurialSource(
value) | 54 source_repos[re.sub(r"_repository$", "", option)] = MercurialSource(
value) |
| 57 | 55 |
| 58 basedir = get_config().get("subscriptionDownloads", "outdir") | 56 basedir = get_config().get("subscriptionDownloads", "outdir") |
| 59 destination = os.path.join(basedir, "data") | 57 destination = os.path.join(basedir, "data") |
| 60 try: | 58 try: |
| 61 combine_subscriptions(source_repos, destination, tempdir=basedir) | 59 combine_subscriptions(source_repos, destination, tempdir=basedir) |
| 62 finally: | 60 finally: |
| 63 for source in source_repos.itervalues(): | 61 for source in source_repos.itervalues(): |
| 64 source.close() | 62 source.close() |
| OLD | NEW |