Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv7164
Modified Files:
Defaults.py
Log Message:
Slightly more readable (to me) implementation.
Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- Defaults.py 5 Dec 2002 18:15:09 -0000 1.165
+++ Defaults.py 5 Dec 2002 18:45:18 -0000 1.166
@@ -1380,9 +1380,10 @@
raise Errors.ConfigError, \
CRYPT_KEY_FILE + " must be chmod 400 or 600!"
else:
- if not os.environ.has_key("TMDA_CGI_MODE"):
- raise Errors.ConfigError, "Can't find key file: " + CRYPT_KEY_FILE
- if os.environ["TMDA_CGI_MODE"] != "no-su":
+ if os.environ.has_key('TMDA_CGI_MODE') and \
+ os.environ['TMDA_CGI_MODE'] == 'no-su':
+ pass
+ else:
raise Errors.ConfigError, "Can't find key file: " + CRYPT_KEY_FILE
# Read key from CRYPT_KEY_FILE, and then convert it from hex back into
@@ -1390,8 +1391,11 @@
try:
CRYPT_KEY = binascii.unhexlify(open(CRYPT_KEY_FILE).read().strip())
except IOError:
- if not os.environ.has_key("TMDA_CGI_MODE"): raise
- if os.environ["TMDA_CGI_MODE"] != "no-su": raise
+ if os.environ.has_key('TMDA_CGI_MODE') and \
+ os.environ['TMDA_CGI_MODE'] == 'no-su':
+ pass
+ else:
+ raise
###################################
# END of user configurable settings
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
