SF.net SVN: safekeep: [317] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 317
          http://safekeep.svn.sourceforge.net/safekeep/?rev=317&view=rev
Author:   dimi
Date:     2007-01-26 15:25:37 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
Use the standard os.getenv() instead our ad-hoc version

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-01-26 23:16:44 UTC (rev 316)
+++ safekeep/trunk/safekeep	2007-01-26 23:25:37 UTC (rev 317)
@@ -100,11 +100,6 @@
     if path.startswith('/'): return root + path
     return os.path.join(root, path)
 
-def getenv(var, defval=None):
-    val = os.environ.get(var)
-    if val is None: return defval
-    return val
-
 ######################################################################
 # Configuration file parser
 ######################################################################
@@ -168,7 +163,7 @@
         host = user = key_ctrl = key_data = None
     if host and not user:
         user = 'root'
-    home = getenv('HOME', '/root')
+    home = os.getenv('HOME', '/root')
     if host and not key_ctrl:
         key_ctrl = os.path.join(home, '.ssh', 'safekeep-server-ctrl-key')
     if host and not key_data:
@@ -627,7 +622,7 @@
                 if deploy:
                     info('%s: Key do not exist, generating it now: %s' % (id, privatekeyfile))
                     gencmd = 'ssh-keygen -q -b 1024 -t dsa -N "" -C "SafeKeep auto generated key at %s@%s" -f %s' % \
-                          (getenv('LOGNAME', 'root'), os.uname()[1], privatekeyfile)
+                          (os.getenv('LOGNAME', 'root'), os.uname()[1], privatekeyfile)
                     debug(gencmd)
                     if os.system(gencmd):
                         error('%s: Failed to generate key %s. Skipping client.' % (id, privatekeyfile))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.