From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 17 Oct 2011 15:53:29 +0000 (-0700)
Subject: UpdateChangeLog: use struct_passwd attributes
X-Git-Tag: v2.2.0_alpha69~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85256ed31e67655530dc26a4a036bfda963e9722;p=portage.git

UpdateChangeLog: use struct_passwd attributes
---

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index e0687491a..588ca8d82 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -538,9 +538,9 @@ def UpdateChangeLog(pkgdir, category, package, new, removed, changed, msg, prete
 	elif 'ECHANGELOG_USER' in os.environ:
 		user = os.environ['ECHANGELOG_USER']
 	else:
-		(login, _, _, _, gecos, _, _) = pwd.getpwuid(os.getuid())
-		gecos = gecos.split(',')[0]  # bug #80011
-		user = '%s <%s@gentoo.org>' % (gecos, login)
+		pwd_struct = pwd.getpwuid(os.getuid())
+		gecos = pwd_struct.pw_gecos.split(',')[0]  # bug #80011
+		user = '%s <%s@gentoo.org>' % (gecos, pwd_struct.pw_name)
 
 	if '<root@' in user:
 		err = 'Please set ECHANGELOG_USER or run as non-root'