Fix _lazy_accept_license to discard || from the set of licenses. (trunk r13565)
authorZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 16:45:32 +0000 (16:45 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 16:45:32 +0000 (16:45 -0000)
svn path=/main/branches/2.1.6/; revision=13566

pym/portage/__init__.py

index 35bbd6a409f08279b7c0522b85e55366d04133ea..3e6fff3001ebe3f16c35904c960b7deb98f68d5d 100644 (file)
@@ -2088,6 +2088,7 @@ class config(object):
                                        uselist=use.split())))
                        except exception.InvalidDependString:
                                licenses = set()
+                       licenses.discard('||')
                        if '*' not in settings._accept_license:
                                licenses.intersection_update(settings._accept_license)
                        return ' '.join(sorted(licenses))