Gentoo Archives: gentoo-commits

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