From ae4fa2db7c18d86bab753f31694343b989cdbb4a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 2 Apr 2009 19:01:24 +0200 Subject: [PATCH] entropy.spm.quickpkg: properly set username and group bits in tar files --- libraries/entropy/spm.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libraries/entropy/spm.py b/libraries/entropy/spm.py index 048574f9b..3cd9f6a7f 100644 --- a/libraries/entropy/spm.py +++ b/libraries/entropy/spm.py @@ -515,8 +515,19 @@ class PortagePlugin: os.path.isdir(lpath): lpath = os.path.realpath(lpath) tarinfo = tar.gettarinfo(lpath, arcname) - tarinfo.uname = id_strings.setdefault(tarinfo.uid, str(tarinfo.uid)) - tarinfo.gname = id_strings.setdefault(tarinfo.gid, str(tarinfo.gid)) + + uid = tarinfo.uid + gid = tarinfo.gid + user = self.entropyTools.get_user_from_uid(uid) + group = self.entropyTools.get_group_from_gid(gid) + if user == None: + user = str(uid) + if group == None: + group = str(gid) + + tarinfo.uname = id_strings.setdefault(tarinfo.uid, user) + tarinfo.gname = id_strings.setdefault(tarinfo.gid, group) + print "uname, gname", tarinfo.uname, tarinfo.gname if stat.S_ISREG(exist.st_mode): tarinfo.type = tarfile.REGTYPE