| 1 |
--- |
| 2 |
pym/_emerge/BlockerDB.py | 4 ++-- |
| 3 |
pym/_emerge/actions.py | 9 +++------ |
| 4 |
pym/_emerge/depgraph.py | 8 ++++---- |
| 5 |
pym/_emerge/resolver/output.py | 4 ++-- |
| 6 |
pym/_emerge/show_invalid_depstring_notice.py | 4 ++-- |
| 7 |
5 files changed, 13 insertions(+), 16 deletions(-) |
| 8 |
|
| 9 |
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py |
| 10 |
index 44a70a098..5b3b01c37 100644 |
| 11 |
--- a/pym/_emerge/BlockerDB.py |
| 12 |
+++ b/pym/_emerge/BlockerDB.py |
| 13 |
@@ -1,4 +1,4 @@ |
| 14 |
-# Copyright 1999-2015 Gentoo Foundation |
| 15 |
+# Copyright 1999-2018 Gentoo Foundation |
| 16 |
# Distributed under the terms of the GNU General Public License v2 |
| 17 |
|
| 18 |
import sys |
| 19 |
@@ -99,7 +99,7 @@ class BlockerDB(object): |
| 20 |
trees=dep_check_trees, myroot=new_pkg.root) |
| 21 |
if not success: |
| 22 |
# We should never get this far with invalid deps. |
| 23 |
- show_invalid_depstring_notice(new_pkg, depstr, atoms) |
| 24 |
+ show_invalid_depstring_notice(new_pkg, atoms) |
| 25 |
assert False |
| 26 |
|
| 27 |
blocker_atoms = [atom.lstrip("!") for atom in atoms \ |
| 28 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 29 |
index 2293560c1..455aa7e04 100644 |
| 30 |
--- a/pym/_emerge/actions.py |
| 31 |
+++ b/pym/_emerge/actions.py |
| 32 |
@@ -816,8 +816,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, |
| 33 |
protected_set.add("=" + pkg.cpv) |
| 34 |
continue |
| 35 |
except portage.exception.InvalidDependString as e: |
| 36 |
- show_invalid_depstring_notice(pkg, |
| 37 |
- pkg._metadata["PROVIDE"], _unicode(e)) |
| 38 |
+ show_invalid_depstring_notice(pkg, _unicode(e)) |
| 39 |
del e |
| 40 |
protected_set.add("=" + pkg.cpv) |
| 41 |
continue |
| 42 |
@@ -870,8 +869,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, |
| 43 |
protected_set.add("=" + pkg.cpv) |
| 44 |
continue |
| 45 |
except portage.exception.InvalidDependString as e: |
| 46 |
- show_invalid_depstring_notice(pkg, |
| 47 |
- pkg._metadata["PROVIDE"], _unicode(e)) |
| 48 |
+ show_invalid_depstring_notice(pkg, _unicode(e)) |
| 49 |
del e |
| 50 |
protected_set.add("=" + pkg.cpv) |
| 51 |
continue |
| 52 |
@@ -888,8 +886,7 @@ def calc_depclean(settings, trees, ldpath_mtimes, |
| 53 |
if excluded_set.findAtomForPackage(pkg): |
| 54 |
required_sets['__excluded__'].add("=" + pkg.cpv) |
| 55 |
except portage.exception.InvalidDependString as e: |
| 56 |
- show_invalid_depstring_notice(pkg, |
| 57 |
- pkg._metadata["PROVIDE"], _unicode(e)) |
| 58 |
+ show_invalid_depstring_notice(pkg, _unicode(e)) |
| 59 |
del e |
| 60 |
required_sets['__excluded__'].add("=" + pkg.cpv) |
| 61 |
|
| 62 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 63 |
index 1c47b4b63..747ef1a1a 100644 |
| 64 |
--- a/pym/_emerge/depgraph.py |
| 65 |
+++ b/pym/_emerge/depgraph.py |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2017 Gentoo Foundation |
| 68 |
+# Copyright 1999-2018 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
from __future__ import division, print_function, unicode_literals |
| 72 |
@@ -7095,7 +7095,7 @@ class depgraph(object): |
| 73 |
# matches (this can happen if an atom lacks a |
| 74 |
# category). |
| 75 |
show_invalid_depstring_notice( |
| 76 |
- pkg, depstr, "%s" % (e,)) |
| 77 |
+ pkg, "%s" % (e,)) |
| 78 |
del e |
| 79 |
raise |
| 80 |
if not success: |
| 81 |
@@ -7108,7 +7108,7 @@ class depgraph(object): |
| 82 |
# annoy the user too much (otherwise they'd be |
| 83 |
# forced to manually unmerge it first). |
| 84 |
continue |
| 85 |
- show_invalid_depstring_notice(pkg, depstr, atoms) |
| 86 |
+ show_invalid_depstring_notice(pkg, atoms) |
| 87 |
return False |
| 88 |
blocker_atoms = [myatom for myatom in atoms \ |
| 89 |
if myatom.blocker] |
| 90 |
@@ -7126,7 +7126,7 @@ class depgraph(object): |
| 91 |
except portage.exception.InvalidAtom as e: |
| 92 |
depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys)) |
| 93 |
show_invalid_depstring_notice( |
| 94 |
- pkg, depstr, "Invalid Atom: %s" % (e,)) |
| 95 |
+ pkg, "Invalid Atom: %s" % (e,)) |
| 96 |
return False |
| 97 |
for cpv in stale_cache: |
| 98 |
del blocker_cache[cpv] |
| 99 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
| 100 |
index e993ce17d..24340576c 100644 |
| 101 |
--- a/pym/_emerge/resolver/output.py |
| 102 |
+++ b/pym/_emerge/resolver/output.py |
| 103 |
@@ -1,4 +1,4 @@ |
| 104 |
-# Copyright 2010-2014 Gentoo Foundation |
| 105 |
+# Copyright 2010-2018 Gentoo Foundation |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
"""Resolver output display operation. |
| 109 |
@@ -316,7 +316,7 @@ class Display(object): |
| 110 |
depstr, = db.aux_get(pkg.cpv, |
| 111 |
["SRC_URI"], myrepo=pkg.repo) |
| 112 |
show_invalid_depstring_notice( |
| 113 |
- pkg, depstr, _unicode(e)) |
| 114 |
+ pkg, _unicode(e)) |
| 115 |
raise |
| 116 |
except SignatureException: |
| 117 |
# missing/invalid binary package SIZE signature |
| 118 |
diff --git a/pym/_emerge/show_invalid_depstring_notice.py b/pym/_emerge/show_invalid_depstring_notice.py |
| 119 |
index a230b3152..e11ea65ed 100644 |
| 120 |
--- a/pym/_emerge/show_invalid_depstring_notice.py |
| 121 |
+++ b/pym/_emerge/show_invalid_depstring_notice.py |
| 122 |
@@ -1,4 +1,4 @@ |
| 123 |
-# Copyright 1999-2010 Gentoo Foundation |
| 124 |
+# Copyright 1999-2018 Gentoo Foundation |
| 125 |
# Distributed under the terms of the GNU General Public License v2 |
| 126 |
|
| 127 |
import logging |
| 128 |
@@ -7,7 +7,7 @@ import portage |
| 129 |
from portage import os |
| 130 |
from portage.util import writemsg_level |
| 131 |
|
| 132 |
-def show_invalid_depstring_notice(parent_node, depstring, error_msg): |
| 133 |
+def show_invalid_depstring_notice(parent_node, error_msg): |
| 134 |
|
| 135 |
msg1 = "\n\n!!! Invalid or corrupt dependency specification: " + \ |
| 136 |
"\n\n%s\n\n%s\n\n" % (error_msg, parent_node) |
| 137 |
-- |
| 138 |
2.16.2 |
Archives