Make --prune bail out like depclean does if there are unresolved dependencies. Notif...

svn path=/main/trunk/; revision=7309

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 00ba5b6f21229bd478a40a7f75cd990d1abca116..7c9366dae80f8610693ea48b78481fb67c8f274e 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -5449,14 +5449,17 @@ def action_depclean(settings, trees, ldpath_mtimes,
                print
                for atom in unresolveable:
                        print atom, "required by", " ".join(unresolveable[atom])
-       if unresolveable and action == "depclean":
+       if unresolveable:
                print
                print "Have you forgotten to run " + good("`emerge --update --newuse --deep world`") + " prior to"
-               print "depclean?  It may be necessary to manually uninstall packages that no longer"
+               print "%s?  It may be necessary to manually uninstall packages that no longer" % action
                print "exist in the portage tree since it may not be possible to satisfy their"
                print "dependencies.  Also, be aware of the --with-bdeps option that is documented"
                print "in " + good("`man emerge`") + "."
                print
+               if action == "prune":
+                       print "If you would like to ignore dependencies then use %s." % \
+                               good("--nodeps")
                return
 
        def show_parents(child_node):