Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13566 - main/branches/2.1.6/pym/portage
Date: Thu, 30 Apr 2009 16:45:35
Message-Id: E1LzZO9-0002Bw-G0@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 16:45:32 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13566
4
5 Modified:
6 main/branches/2.1.6/pym/portage/__init__.py
7 Log:
8 Fix _lazy_accept_license to discard || from the set of licenses. (trunk r13565)
9
10 Modified: main/branches/2.1.6/pym/portage/__init__.py
11 ===================================================================
12 --- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 16:44:46 UTC (rev 13565)
13 +++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 16:45:32 UTC (rev 13566)
14 @@ -2088,6 +2088,7 @@
15 uselist=use.split())))
16 except exception.InvalidDependString:
17 licenses = set()
18 + licenses.discard('||')
19 if '*' not in settings._accept_license:
20 licenses.intersection_update(settings._accept_license)
21 return ' '.join(sorted(licenses))