Use os.error instead of OSError for older Pythons

checkadminpw(): wrap stat of data/adm.pw in a try/except to catch
situations where there is no site password.

1 files changed, 8 insertions, 2 deletions

diff --git a/bin/check_perms b/bin/check_perms
index d965bc56e..1ef0f82ab 100755
--- a/bin/check_perms
+++ b/bin/check_perms
@@ -49,7 +49,7 @@ def checkwalk(arg, dirname, names):
             print 'checking gid and modes for', path
         try:
             mode, gid = statgidmode(path)
-        except OSError, (code, msg):
+        except os.error, (code, msg):
             if code == errno.ENOENT:
                 continue
             raise
@@ -125,7 +125,13 @@ def checkadminpw():
     targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP
     if STATE.VERBOSE:
         print 'checking perms on', adminpw
-    mode = statmode(adminpw)
+    try:
+        mode = statmode(adminpw)
+    except os.error, (code, msg):
+        # adm.pw may not exist
+        if code == errno.ENOENT:
+            return
+        raise
     if mode <> targetmode:
         STATE.ERRORS = STATE.ERRORS + 1
         print adminpw, 'permissions must be exactly 0640 (got %s)' % oct(mode)