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 1SffYz-0000Jz-17 for garchives@archives.gentoo.org; Fri, 15 Jun 2012 23:04:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB9C1E0874; Fri, 15 Jun 2012 23:04:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BAEA0E0874 for ; Fri, 15 Jun 2012 23:04:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 175701B4033 for ; Fri, 15 Jun 2012 23:04:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 07C85E5430 for ; Fri, 15 Jun 2012 23:04:10 +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: <1339801439.b363b5342ac918f06e8752e702e68363d1388cdb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py pym/portage/tests/resolver/test_autounmask.py X-VCS-Directories: pym/portage/tests/resolver/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b363b5342ac918f06e8752e702e68363d1388cdb X-VCS-Branch: master Date: Fri, 15 Jun 2012 23:04:10 +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: 5bdf4b18-831d-4671-906d-bf8a8d4d38e7 X-Archives-Hash: 4df587db5c04b5d553e5dc763dded0e5 commit: b363b5342ac918f06e8752e702e68363d1388cdb Author: Zac Medico gentoo org> AuthorDate: Fri Jun 15 23:03:59 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 15 23:03:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db363b534 Add USE + license autounmask for bug #420847. --- pym/_emerge/depgraph.py | 9 +++++++-- pym/portage/tests/resolver/test_autounmask.py | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2e98be8..5eece98 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3522,7 +3522,8 @@ class depgraph(object): """ Iterate over the different allowed things to unmask. =20 - 1. USE + 0. USE + 1. USE + license 2. USE + ~arch + license 3. USE + ~arch + license + missing keywords 4. USE + ~arch + license + masks @@ -3541,8 +3542,12 @@ class depgraph(object): autounmask_level =3D self._AutounmaskLevel() =20 autounmask_level.allow_use_changes =3D True + yield autounmask_level =20 - for only_use_changes in (True, False): + autounmask_level.allow_license_changes =3D True + yield autounmask_level + + for only_use_changes in (False,): =20 autounmask_level.allow_unstable_keywords =3D (not only_use_changes) autounmask_level.allow_license_changes =3D (not only_use_changes) diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/= tests/resolver/test_autounmask.py index c75a174..84182ba 100644 --- a/pym/portage/tests/resolver/test_autounmask.py +++ b/pym/portage/tests/resolver/test_autounmask.py @@ -321,12 +321,12 @@ class AutounmaskTestCase(TestCase): license_changes =3D { "dev-libs/D-1": set(["TEST"]), "dev-libs/E-1"= : set(["TEST"]), "dev-libs/E-2": set(["TEST"]), "dev-libs/F-1": set(["TES= T"]) }), =20 #Test license only for bug #420847 - #ResolverPlaygroundTestCase( - #["dev-java/sun-jdk"], - #options =3D {"--autounmask": True}, - #success =3D False, - #mergelist =3D ["dev-java/sun-jdk-1.6.0.31"], - #license_changes =3D { "dev-java/sun-jdk-1.6.0.31": set(["TEST"]) }= ), + ResolverPlaygroundTestCase( + ["dev-java/sun-jdk"], + options =3D {"--autounmask": True}, + success =3D False, + mergelist =3D ["dev-java/sun-jdk-1.6.0.31"], + license_changes =3D { "dev-java/sun-jdk-1.6.0.31": set(["TEST"]) })= , ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds)