diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-09-06 11:57:38 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-09-06 11:57:38 (GMT) |
| commit | 388c0e2325f606d497ec174a4a6b28c4d352db2c (patch) | |
| tree | 83ab157488dd364de2a26b453c34e6ce7cc29537 /Lib/tarfile.py | |
| parent | 6d8f744730c0689d822db1a2425170d7d5d44aca (diff) | |
| parent | 900c292c6b886ad9c693d7e0481dc16398d5071d (diff) | |
| download | cpython-388c0e2325f606d497ec174a4a6b28c4d352db2c.zip cpython-388c0e2325f606d497ec174a4a6b28c4d352db2c.tar.gz cpython-388c0e2325f606d497ec174a4a6b28c4d352db2c.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/tarfile.py')
| -rw-r--r-- | Lib/tarfile.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 6bdbf36..2560562 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -2366,17 +2366,11 @@ class TarFile(object): try: g = grp.getgrnam(tarinfo.gname)[2] except KeyError: - try: - g = grp.getgrgid(tarinfo.gid)[2] - except KeyError: - g = os.getgid() + g = tarinfo.gid try: u = pwd.getpwnam(tarinfo.uname)[2] except KeyError: - try: - u = pwd.getpwuid(tarinfo.uid)[2] - except KeyError: - u = os.getuid() + u = tarinfo.uid try: if tarinfo.issym() and hasattr(os, "lchown"): os.lchown(targetpath, u, g) |