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

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

Revision: 564
          http://safekeep.svn.sourceforge.net/safekeep/?rev=564&view=rev
Author:   dimi
Date:     2007-11-07 06:36:06 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Always require specification of the operation mode,
based on suggestion from Gert <ger...@ta...>.

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

Modified: safekeep/trunk/TODO
===================================================================
--- safekeep/trunk/TODO	2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/TODO	2007-11-07 14:36:06 UTC (rev 564)
@@ -7,11 +7,6 @@
   * Øyvind Skaar <os...@op...>: FreeBSD have snapshot capabilities
     - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/snapshots.html
     - http://www.freebsd.org/cgi/man.cgi?query=snapshot&sektion=0&manpath=FreeBSD+6.2-RELEASE&apropos=1&format=html
-  * Gert <ger...@ta...>: change default mode from --server
-    A small, but annoying issue (to me) it the fact that the default 
-    action for /usr/bin/safekeep is to run the server.  This means that 
-    making a typo (eg /usr/bin/safekeep -help) or not knowing the 
-    parameters always triggers the server and starts the full backup process.
   * Dag Wieers <da...@wi...>: avoid asciidoc build requirements
     Would it be possible to recreate the manpages and other asciidoc documents
     before distributing the tar-files ? That way there is no dependency on

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/doc/safekeep.txt	2007-11-07 14:36:06 UTC (rev 564)
@@ -7,7 +7,7 @@
 
 SYNOPSIS
 --------
-'safekeep' [--server] [-q] [-v] [--force] [-c file] <clientid>*
+'safekeep' --server [-q] [-v] [--force] [-c file] <clientid>*
 
 'safekeep' --keys [-q] [-v] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*
 
@@ -51,7 +51,7 @@
 OPERATION MODE
 --------------
 --server::
-	Selects the server mode (default)
+	Selects the server mode 
 
 --client::
 	Selects the client mode. This should never be invoked manually, the
@@ -61,6 +61,9 @@
 --keys::
 	Selects the SSH key management mode
 
+Please note that you must always specify an operation mode. Earlier 
+versions used do default to `--server` mode, but that proved to work 
+out poorly in practice.
 
 GENERAL OPTIONS
 ---------------

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-11-07 14:21:25 UTC (rev 563)
+++ safekeep/trunk/safekeep	2007-11-07 14:36:06 UTC (rev 564)
@@ -845,11 +845,11 @@
 ######################################################################
 
 def usage(exitcode=None):
-    print 'usage: %s [--server] [common options] [server options] <client-id>*' % (sys.argv[0])
+    print 'usage: %s --server [common options] [server options] <client-id>*' % (sys.argv[0])
     print '       %s --keys [common options] [keys options] <client-id>*' % (sys.argv[0])
     print
-    print 'mode selection (pick one):'
-    print '--server            launch in server mode (default)'
+    print 'mode selection (you must pick one):'
+    print '--server            launch in server mode'
     print '--keys              launch in keys management mode'
     print
     print 'common options:'
@@ -940,7 +940,7 @@
             return
 
     if mode is None:
-        mode = 'server'
+        usage(2)
 
     if mode is not 'keys' and (identity or keys_status or keys_print or keys_deploy):
         usage(2)


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