diff options
author | Lars Gustäbel <lars@gustaebel.de> | 2010-10-04 15:31:05 (GMT) |
---|---|---|
committer | Lars Gustäbel <lars@gustaebel.de> | 2010-10-04 15:31:05 (GMT) |
commit | 2fdbfc507e0a2e2b92415bf5a25090a6839ae799 (patch) | |
tree | fce70ee0109705d294f79c069af30d2beabed1eb /Lib | |
parent | 3cc7d7ae89d4ff2c719c8e4b4d4046cbbf4a23f2 (diff) | |
download | cpython-2fdbfc507e0a2e2b92415bf5a25090a6839ae799.zip cpython-2fdbfc507e0a2e2b92415bf5a25090a6839ae799.tar.gz cpython-2fdbfc507e0a2e2b92415bf5a25090a6839ae799.tar.bz2 |
Merged revisions 85211 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85211 | lars.gustaebel | 2010-10-04 17:18:47 +0200 (Mon, 04 Oct 2010) | 14 lines
Issue #9065: no longer use "root" as the default for the
uname and gname field.
If tarfile creates a new archive and adds a file with a
uid/gid that doesn't have a corresponding name on the
system (e.g. because the user/group account was deleted) it
uses the empty string in the uname/gname field now instead
of "root". Using "root" as the default was a bad idea
because on extraction the uname/gname fields are supposed
to override the uid/gid fields. So, all archive members
with nameless uids/gids belonged to the root user after
extraction.
........
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/tarfile.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index bc608e9..beb41357 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -923,8 +923,8 @@ class TarInfo(object): self.chksum = 0 # header checksum self.type = REGTYPE # member type self.linkname = "" # link name - self.uname = "root" # user name - self.gname = "root" # group name + self.uname = "" # user name + self.gname = "" # group name self.devmajor = 0 # device major number self.devminor = 0 # device minor number @@ -1102,8 +1102,8 @@ class TarInfo(object): info.get("type", REGTYPE), stn(info.get("linkname", ""), 100, encoding, errors), info.get("magic", POSIX_MAGIC), - stn(info.get("uname", "root"), 32, encoding, errors), - stn(info.get("gname", "root"), 32, encoding, errors), + stn(info.get("uname", ""), 32, encoding, errors), + stn(info.get("gname", ""), 32, encoding, errors), itn(info.get("devmajor", 0), 8, format), itn(info.get("devminor", 0), 8, format), stn(info.get("prefix", ""), 155, encoding, errors) |