From c4d510d343e776319fb40b7ea4f395b071d98527 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 25 Jun 2008 20:26:36 +0000 Subject: [PATCH] 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 --- doc/config/sets.docbook | 2 +- pym/_emerge/__init__.py | 2 +- pym/portage/sets/dbapi.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/config/sets.docbook b/doc/config/sets.docbook index 40274a426..b284f5e2a 100644 --- a/doc/config/sets.docbook +++ b/doc/config/sets.docbook @@ -443,7 +443,7 @@ portage.sets.dbapi.EverythingSet A superset of the classic world target, a set created - by this class contains all installed packages. + by this class contains SLOT atoms to match all installed packages. diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index e207885f6..93fa11246 100644 --- 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 fca742552..bacc3a5c5 100644 --- 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 -- 2.26.2