[gentoo-commits] proj/portage:prefix commit in: pym/portage/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     1fd41e665b7c1c404eaf67d981e701d90817f784
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 15:27:58 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 15:27:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1fd41e66

Resolve conflict.

Long ago, VCSs would warn when you would want to commit conflict
markers.

---
 pym/portage/data.py |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 5651e7d..b2aac06 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -90,10 +90,6 @@ def _get_global(k):
 			secpass = 2
 		#Discover the uid and gid of the portage user/group
 		try:
-<<<<<<< HEAD
-=======
-			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
->>>>>>> overlays-gentoo-org/master
 			portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
 		except KeyError:
 			# PREFIX LOCAL: some sysadmins are insane, bug #344307
@@ -103,7 +99,7 @@ def _get_global(k):
 				portage_gid = None
 			# END PREFIX LOCAL
 		try:
-			portage_uid = pwd.getpwnam(_get_global('_portage_uname')).pw_uid
+			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
 			if secpass < 1 and portage_gid in os.getgroups():
 				secpass = 1
 		except KeyError: