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

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

Revision: 312
          http://safekeep.svn.sourceforge.net/safekeep/?rev=312&view=rev
Author:   dimi
Date:     2007-01-26 13:46:41 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
Rename the -C option to -c now that it is available.

Modified Paths:
--------------
    safekeep/trunk/doc/safekeep.txt
    safekeep/trunk/safekeep
    safekeep/trunk/safekeep-test

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-01-26 21:16:33 UTC (rev 311)
+++ safekeep/trunk/doc/safekeep.txt	2007-01-26 21:46:41 UTC (rev 312)
@@ -7,7 +7,7 @@
 
 SYNOPSIS
 --------
-'safekeep' [--server] [-q] [-v] [-C file] [-e <email>] [-m <smtp>] <clientid>*
+'safekeep' [--server] [-q] [-v] [-c file] [-e <email>] [-m <smtp>] <clientid>*
 
 'safekeep' --client
 
@@ -82,7 +82,7 @@
 
 SERVER OPTIONS
 --------------
--C, --cfg=FILE|DIR::
+-c, --cfg=FILE|DIR::
 	Specifies the configuration file location.
 	This can be a single file (for a single client configuration)
 	or a directory containing several configuration files (one per

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-01-26 21:16:33 UTC (rev 311)
+++ safekeep/trunk/safekeep	2007-01-26 21:46:41 UTC (rev 312)
@@ -759,14 +759,14 @@
     print '--deploy            deploy the authorization keys'
     print
     print 'server options:'
-    print '-C, --cfg=FILE|DIR  use the given configuration file/directory'
+    print '-c, --cfg=FILE|DIR  use the given configuration file/directory'
     print '-e, --email=EMAIL   send results by email (can appear multiple times)'
     print '-m, --smtp=SMTP     SMTP server to use when sending mails (default: built-in SMTP)'
     if exitcode is not None: sys.exit(exitcode)
 
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'C:e:hm:qvV',
+        opts, args = getopt.getopt(sys.argv[1:], 'c:e:hm:qvV',
                                    [ 'cfg=', 'client', 'clientid=', 'deploy',
                                      'email=', 'help', 'keys', 'print',
                                      'quiet', 'server', 'smtp=', 'status',
@@ -784,7 +784,7 @@
     keys_print = None
     keys_deploy = None
     for o, a in opts:
-        if o in ('-C', '--cfg'):
+        if o in ('-c', '--cfg'):
             cfglocs.append(a)
         elif o in ('-e', '--email'):
             email.append(a)
@@ -836,7 +836,7 @@
             if arg in cfgs: continue
             error('Unknown client ID: %s' % arg)
             if os.path.isfile(arg):
-                error('It appears to be a file, configuration files are passed via the -C/--cfg switch.')
+                error('It appears to be a file, configuration files are passed via the -c/--cfg switch.')
             ok = False
         if not ok: sys.exit(2)
 

Modified: safekeep/trunk/safekeep-test
===================================================================
--- safekeep/trunk/safekeep-test	2007-01-26 21:16:33 UTC (rev 311)
+++ safekeep/trunk/safekeep-test	2007-01-26 21:46:41 UTC (rev 312)
@@ -211,7 +211,7 @@
 
 def createKey(user, host, keyname, comment):
     key = '/home/%s/.ssh/%s' % (user, keyname)
-    cmd = 'test -f %s || ssh-keygen -q -b 1024 -t dsa -N \'\' -C \'%s\' -f %s' % (key, comment, key)
+    cmd = 'test -f %s || ssh-keygen -q -b 1024 -t dsa -N \'\' -c \'%s\' -f %s' % (key, comment, key)
     rcmd(cmd, user, host, 'create %s on server' % keyname)
     return key
 


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