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

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

Revision: 441
          http://safekeep.svn.sourceforge.net/safekeep/?rev=441&view=rev
Author:   dimi
Date:     2007-03-07 13:28:11 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
Deprecate the ability to specify client config files on the command line

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

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-03-07 19:13:40 UTC (rev 440)
+++ safekeep/trunk/doc/safekeep.txt	2007-03-07 21:28:11 UTC (rev 441)
@@ -82,13 +82,10 @@
 
 SERVER OPTIONS
 --------------
--c, --conf=FILE|DIR::
+-c, --conf=FILE::
 	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
-	backup client). Can be specified multiple times.
-        If not specified at all, SafeKeep will default in non-client mode
-        to searching `/etc/safekeep/clients.d/` for configuration files. 
+        If not specified at all, SafeKeep will default to
+	`/etc/safekeep/safekeep.conf` if it exists.
         Simply using this default is the recommended usage. 
 
 KEYS OPTIONS

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-03-07 19:13:40 UTC (rev 440)
+++ safekeep/trunk/safekeep	2007-03-07 21:28:11 UTC (rev 441)
@@ -770,7 +770,7 @@
     print '--keys              launch in keys management mode'
     print
     print 'common options:'
-    print '-c, --conf=FILE|DIR use the given configuration file/directory'
+    print '-c, --conf=FILE     use the FILE configuration file'
     print '-h, --help          show this help message and exit'
     print '-q, --quiet         decreases the verbosity level'
     print '-v, --verbose       increases the verbosity level'
@@ -805,6 +805,7 @@
     for o, a in opts:
         if o in ('-c', '--conf'):
             if os.path.isdir(a) or a.endswith(config_ext):
+                warn('Adding client config files/dirs via this switch is deprecated')
                 cfglocs.append(a)
             elif cfgfile is None:
                 cfgfile = a


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