From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 10E9613877A for ; Fri, 22 Aug 2014 16:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD6FE0839; Fri, 22 Aug 2014 16:45:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B55B3E0839 for ; Fri, 22 Aug 2014 16:45:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 828D733FEC9 for ; Fri, 22 Aug 2014 16:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F04A3BB9 for ; Fri, 22 Aug 2014 16:45:03 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1408725472.0639158d8bbc5cb3ea6cd88b43651171c8b149e8.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: /, pym/portage/emaint/modules/merges/ X-VCS-Repository: proj/portage X-VCS-Files: RELEASE-NOTES pym/portage/emaint/modules/merges/merges.py X-VCS-Directories: / pym/portage/emaint/modules/merges/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 0639158d8bbc5cb3ea6cd88b43651171c8b149e8 X-VCS-Branch: master Date: Fri, 22 Aug 2014 16:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 859352bd-ddfb-41c8-a5e2-52cd6cbd5c54 X-Archives-Hash: e50b00a7091e8eb5e6d1540078464f67 commit: 0639158d8bbc5cb3ea6cd88b43651171c8b149e8 Author: Brian Dolbec gentoo org> AuthorDate: Fri Aug 22 16:33:03 2014 +0000 Commit: Brian Dolbec gmail 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)