Merged from trunk 10784:10787

   | 10785   | Fix Atom -> str breakage in depgraph.saveNomergeFavorites(). |
   | zmedico | Thanks to grobian and darsiide.                              |

   | 10786   | Clarify EverythingSet.description a bit. Thanks to Necoro.   |
   | zmedico |                                                              |

   | 10787   | Clarify EverythingSet.description a bit. Thanks to Necoro.   |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=10788

diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook
index 40274a426b5158a105e5ab1d1a4ff3d52a11e2c2..b284f5e2ac795d1fe60de470479c3a5d8ce2502c 100644 (file)
--- a/doc/config/sets.docbook
+++ b/doc/config/sets.docbook
@@ -443,7 +443,7 @@
                <title>portage.sets.dbapi.EverythingSet</title>
                <para>
                A superset of the classic <parameter>world</parameter> target, a set created
-               by this class contains all installed packages.
+               by this class contains SLOT atoms to match all installed packages.
                </para>
 
                        <sect3>

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e207885f6f0d29292889758227f3e64a0f1e04ee..93fa1124608ac1ac52e1bc180033ea8975954750 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5501,7 +5501,7 @@ class depgraph(object):
                all_added.sort()
                for a in all_added:
                        print ">>> Recording %s in \"world\" favorites file..." % \
-                               colorize("INFORM", a)
+                               colorize("INFORM", str(a))
                if all_added:
                        world_set.update(all_added)
                world_set.unlock()

diff --git a/pym/portage/sets/dbapi.py b/pym/portage/sets/dbapi.py
index fca7425527b3729f696f0dce786499d5db782c09..bacc3a5c5b07c4685a0daf731ec4f7ab95cfcba0 100644 (file)
--- a/pym/portage/sets/dbapi.py
+++ b/pym/portage/sets/dbapi.py
@@ -10,8 +10,9 @@ __all__ = ["CategorySet", "EverythingSet"]
 
 class EverythingSet(PackageSet):
        _operations = ["merge", "unmerge"]
-       description = "Package set containing all installed packages"
-       
+       description = "Package set which contains SLOT " + \
+               "atoms to match all installed packages"
+
        def __init__(self, vdbapi):
                super(EverythingSet, self).__init__()
                self._db = vdbapi