commit: 0639158d8bbc5cb3ea6cd88b43651171c8b149e8
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 22 16:33:03 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Aug 22 16:37:52 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0639158d
emaint merges: Replace .append() with .add() for set variables (bug 520542)
pkg_atoms and pkg_invalid_entries were changed to sets, but were not updated
in the function that added to them.
---
RELEASE-NOTES | 1 +
pym/portage/emaint/modules/merges/merges.py | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 22770ef..388c037 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -5,6 +5,7 @@ portage-2.2.13
==================================
* Bug Fixes:
- Bug # 438976 Remove DESCRIPTION.punctuation check from repoman
+ - Bug # 520542 Replace .append() with .add() for set variables
portage-2.2.12
==================================
diff --git a/pym/portage/emaint/modules/merges/merges.py
b/pym/portage/emaint/modules/merges/merges.py
index 085fe2a..1a67cb5 100644
--- a/pym/portage/emaint/modules/merges/merges.py
+++ b/pym/portage/emaint/modules/merges/merges.py
@@ -168,9 +168,9 @@ class MergesHandler(object):
@param failed_pkgs: failed packages to iterate
@type failed_pkgs: dict
- @param pkg_atoms: append package atoms to this set
+ @param pkg_atoms: add package atoms to this set
@type pkg_atoms: set
- @param pkg_invalid_entries: append any packages that are
invalid to this set
+ @param pkg_invalid_entries: add any packages that are invalid
to this set
@type pkg_invalid_entries: set
"""
@@ -182,10 +182,10 @@ class MergesHandler(object):
pkg_atom = '=%s' % pkg_name
if not isvalidatom(pkg_atom):
- pkg_invalid_entries.append("'%s' is an invalid
package atom."
+ pkg_invalid_entries.add("'%s' is an invalid
package atom."
% pkg_atom)
if not portdb.cpv_exists(pkg_name):
- pkg_invalid_entries.append(
+ pkg_invalid_entries.add(
"'%s' does not exist in the portage
tree." % pkg_name)
pkg_atoms.add(pkg_atom)
