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 306ef6a838d294c823ae5f30a46b4ac77a75cd0a..82046a8ad7c6540097bb05d2bdff9f56cb804e9e 100644 (file)
--- 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):