[gentoo-commits] proj/portage:prefix commit in: lib/portage/package/ebuild/, lib/portage/dbapi/

[Fabian Groffen]

commit:     3652f1cde0d794dd5c6a4ae9f761eec4c1b1f901
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 11:57:39 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 11:57:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3652f1cd

fix merge conflicts

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 lib/portage/dbapi/vartree.py         | 2 +-
 lib/portage/package/ebuild/config.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index 73202f625..6d65919ab 100644
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@ -3729,7 +3729,7 @@ class dblink:
                     node = LinkageMapPeCoff._LibGraphNode(linkmap._obj_key(path))
                 elif chost.find('aix') >= 0:
                     node = LinkageMapXCoff._LibGraphNode(linkmap._obj_key(path))
-                else
+                else:
                     node = LinkageMap._LibGraphNode(linkmap._obj_key(path))
                 alt_path_node = lib_graph.get(node)
                 if alt_path_node is not None:

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 625a1be49..e786bd930 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -3422,4 +3422,3 @@ class config:
 
     keys = __iter__
     items = iteritems
->>>>>>> origin/master