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

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

Revision: 320
          http://safekeep.svn.sourceforge.net/safekeep/?rev=320&view=rev
Author:   dimi
Date:     2007-01-27 10:10:33 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
We need to support the -c/--conf in --keys mode too

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

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-01-27 17:11:50 UTC (rev 319)
+++ safekeep/trunk/doc/safekeep.txt	2007-01-27 18:10:33 UTC (rev 320)
@@ -11,7 +11,7 @@
 
 'safekeep' --client
 
-'safekeep' --keys [-q] [-v] [--status] [--print] [--deploy] <clientid>*
+'safekeep' --keys [-q] [-v] [-c file] [--status] [--print] [--deploy] <clientid>*
 
 'safekeep' -h | -V
 

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-01-27 17:11:50 UTC (rev 319)
+++ safekeep/trunk/safekeep	2007-01-27 18:10:33 UTC (rev 320)
@@ -759,6 +759,7 @@
     print '-V, --version       show the version number and exit'
     print
     print 'keys options:'
+    print '-c, --conf=FILE|DIR use the given configuration file/directory'
     print '--status            display the key status for the clients (default)'
     print '--print             display the authorization keys'
     print '--deploy            deploy the authorization keys'
@@ -826,9 +827,12 @@
     if mode is not 'keys' and (keys_status or keys_print or keys_deploy):
         usage(2)
 
-    if mode is not 'server' and (cfglocs or email or smtp):
+    if mode is not 'server' and (email or smtp):
         usage(2)
 
+    if mode is 'client' and cfglocs:
+        usage(2)
+
     if len(cfglocs) == 0:
         cfglocs.append(config_dir)
     cfgs = parse_locs(cfglocs)


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