aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gmail.com>2017-12-14 07:10:35 -0500
committerTim Harder <radhermit@gmail.com>2017-12-14 07:14:15 -0500
commit26521d513c869eda7393a5bc2d172b86f1ead23f (patch)
treef8803bca5278c6e8f9f1759641be9d3b2ccfc6d0
parentrepository.virtual: InjectedPkg: define the remaining major attrs (diff)
downloadpkgcore-26521d513c869eda7393a5bc2d172b86f1ead23f.tar.gz
pkgcore-26521d513c869eda7393a5bc2d172b86f1ead23f.tar.bz2
pkgcore-26521d513c869eda7393a5bc2d172b86f1ead23f.zip
pmerge: show skipped virtuals if no changes were made and virtuals exist
-rw-r--r--src/pkgcore/scripts/pmerge.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/pkgcore/scripts/pmerge.py b/src/pkgcore/scripts/pmerge.py
index e8627e1b..42e224a9 100644
--- a/src/pkgcore/scripts/pmerge.py
+++ b/src/pkgcore/scripts/pmerge.py
@@ -831,6 +831,15 @@ def main(options, out, err):
out.write(out.bold, 'Took %.2f' % (vdb_time,), out.reset,
' seconds to preload vdb state')
if not changes:
+ # show skipped virtuals
+ virtual_pkgs = set()
+ for x in atoms:
+ virtual_pkgs.update(installed_repos.virtual.match(x))
+ if virtual_pkgs:
+ out.write(
+ "Skipping virtual pkgs:\n%s\n" % '\n'.join(
+ '%s::%s' % (x.versioned_atom, x.repo_id) for x in virtual_pkgs))
+
out.write("Nothing to merge.")
return