diff options
| author |   Tim Harder <radhermit@gmail.com> | 2016-02-28 21:25:08 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2016-02-28 21:26:24 -0500 |
| commit | 94fa542c3448a3949df36535da24e14c264c6215 (patch) | |
| tree | c3e0d9519fa2f26f65b2223f806e9e54c35d0ce7 | |
| parent | examples: remove pclean script (diff) | |
| download | pkgcore-94fa542c3448a3949df36535da24e14c264c6215.tar.gz pkgcore-94fa542c3448a3949df36535da24e14c264c6215.tar.bz2 pkgcore-94fa542c3448a3949df36535da24e14c264c6215.zip | |
pmaint digest: don't split repo path restrictions across an or restrict
| -rw-r--r-- | pkgcore/scripts/pmaint.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgcore/scripts/pmaint.py b/pkgcore/scripts/pmaint.py index 079ea875..0b910778 100644 --- a/pkgcore/scripts/pmaint.py +++ b/pkgcore/scripts/pmaint.py @@ -432,8 +432,6 @@ digest_opts.add_argument( Target repository to search for matches. If no repo is specified all ebuild repos are used. """) - - @digest.bind_final_check def _digest_validate(parser, namespace): repo = namespace.repo @@ -441,15 +439,15 @@ def _digest_validate(parser, namespace): restrictions = [] if repo is not None: if not targets: - restrictions = repo.path_restrict(repo.location) + restrictions.append(repo.path_restrict(repo.location)) else: repo = namespace.domain.all_raw_ebuild_repos if not targets: try: - restrictions = repo.path_restrict(os.getcwd()) + restrictions.append(repo.path_restrict(os.getcwd())) except ValueError: # we're not in a configured repo so manifest everything - restrictions = [repo.path_restrict(x.location) for x in repo.trees] + restrictions.extend(repo.path_restrict(x.location) for x in repo.trees) if not repo.operations.supports("digests"): digest.error("no repository support for digests") |