summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-11-15 23:08:21 +0100
committerChristian Heimes <christian@cheimes.de>2013-11-15 23:08:21 +0100
commitac4f8f6b811d427bb00fd60949d80e6262a022ca (patch)
tree2f57d6c8a2262b6b8a2b6597dccc37f77692900f
parentcae0fd8b1d6f646376201c901cd55635d53bec0f (diff)
downloadcpython-ac4f8f6b811d427bb00fd60949d80e6262a022ca.tar.gz
Issue #19544 and Issue #6516: quick workaround for failing builds
-rw-r--r--Lib/distutils/archive_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 306ef6a838..82046a8ad7 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -20,12 +20,12 @@ from distutils import log
try:
from pwd import getpwnam
-except AttributeError:
+except (ImportError, AttributeError):
getpwnam = None
try:
from grp import getgrnam
-except AttributeError:
+except (ImportError, AttributeError):
getgrnam = None
def _get_gid(name):