[Python-checkins] cpython: Issue #19544 and Issue #6516: quick workaround for failing builds

[christian.heimes]

http://hg.python.org/cpython/rev/b08868fd5994
changeset:   87126:b08868fd5994
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Nov 15 23:08:21 2013 +0100
summary:
  Issue #19544 and Issue #6516: quick workaround for failing builds

files:
  Lib/distutils/archive_util.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -20,12 +20,12 @@
 
 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):

-- 
Repository URL: http://hg.python.org/cpython