From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QUMDj-0001ZB-OI for garchives@archives.gentoo.org; Wed, 08 Jun 2011 17:07:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43CE81C190; Wed, 8 Jun 2011 17:06:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 14D291C137 for ; Wed, 8 Jun 2011 17:06:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 653AC1B401B for ; Wed, 8 Jun 2011 17:06:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A4F218003C for ; Wed, 8 Jun 2011 17:06:48 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95 Date: Wed, 8 Jun 2011 17:06:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1e2b0d37f7f3a60e797e5dfe87e512b9 commit: c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95 Author: Zac Medico gentoo org> AuthorDate: Wed Jun 8 17:05:20 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Jun 8 17:05:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc36d3ea4 autounmask-write: support package.accept_keywords --- pym/_emerge/depgraph.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b9a394e..39179a4 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5786,8 +5786,13 @@ class depgraph(object): settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH) =20 if root in unstable_keyword_msg: + if os.path.exists(os.path.join(abs_user_config, + "package.accept_keywords")): + filename =3D "package.accept_keywords" + else: + filename =3D "package.keywords" file_to_write_to[(abs_user_config, "package.keywords")] =3D \ - find_config_file(abs_user_config, "package.keywords") + find_config_file(abs_user_config, filename) =20 if root in p_mask_change_msg: file_to_write_to[(abs_user_config, "package.unmask")] =3D \