From: Christian Heimes <christian@cheimes.de>
Date: Fri, 15 Nov 2013 22:08:21 +0000 (+0100)
Subject: Issue #19544 and Issue #6516: quick workaround for failing builds
X-Git-Tag: v3.4.0b1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06afed07d1db19161a93a79803023792371392f7;p=thirdparty%2FPython%2Fcpython.git

Issue #19544 and Issue #6516: quick workaround for failing builds
---

diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 306ef6a838d2..82046a8ad7c6 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):