Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/
Date: Sun, 02 Dec 2012 22:18:10
Message-Id: 1354486505.4551596377cf01904245611145be896314254582.zmedico@gentoo
1 commit: 4551596377cf01904245611145be896314254582
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 2 22:15:05 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 2 22:15:05 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=45515963
7
8 show_masked_packages: handle missing license file
9
10 This will fix bug #445628.
11
12 ---
13 pym/_emerge/depgraph.py | 4 +++-
14 1 files changed, 3 insertions(+), 1 deletions(-)
15
16 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
17 index 65a94ab..568a116 100644
18 --- a/pym/_emerge/depgraph.py
19 +++ b/pym/_emerge/depgraph.py
20 @@ -7575,9 +7575,11 @@ def show_masked_packages(masked_packages):
21 shown_comments.add(comment)
22 portdb = root_config.trees["porttree"].dbapi
23 for l in missing_licenses:
24 - l_path = portdb.findLicensePath(l)
25 if l in shown_licenses:
26 continue
27 + l_path = portdb.findLicensePath(l)
28 + if l_path is None:
29 + continue
30 msg = ("A copy of the '%s' license" + \
31 " is located at '%s'.\n\n") % (l, l_path)
32 writemsg(msg, noiselevel=-1)