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

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

Revision: 436
          http://safekeep.svn.sourceforge.net/safekeep/?rev=436&view=rev
Author:   dimi
Date:     2007-03-07 08:52:20 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
Deprecate the email options

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

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-03-07 16:28:08 UTC (rev 435)
+++ safekeep/trunk/doc/safekeep.txt	2007-03-07 16:52:20 UTC (rev 436)
@@ -7,7 +7,7 @@
 
 SYNOPSIS
 --------
-'safekeep' [--server] [-q] [-v] [-c file] [-e <email>] [-s <smtp>] <clientid>*
+'safekeep' [--server] [-q] [-v] [-c file] <clientid>*
 
 'safekeep' --keys [-q] [-v] [-c file] [--status] [--print] [--deploy] <clientid>*
 
@@ -91,16 +91,6 @@
         to searching `/etc/safekeep/clients.d/` for configuration files. 
         Simply using this default is the recommended usage. 
 
--e, --email=EMAIL::
-	In addition to writing the session logs
-	on the standard output, this parameter let the user specify
-	the mail address where the logs are to be send. Can be specified
-	more than once to send reports to multiple addresses.
-
--s, --smtp=SMTP::
-	Specifies the SMTP server used for sending mails when `-e` is used. 
-	Defaults to using `/usr/sbin/sendmail`.
-
 KEYS OPTIONS
 ------------
 --status::

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-03-07 16:28:08 UTC (rev 435)
+++ safekeep/trunk/safekeep	2007-03-07 16:52:20 UTC (rev 436)
@@ -776,10 +776,6 @@
     print '-v, --verbose       increases the verbosity level'
     print '-V, --version       show the version number and exit'
     print
-    print 'server options:'
-    print '-e, --email=EMAIL   send results by email (can appear multiple times)'
-    print '-s, --smtp=SMTP     SMTP server to use when sending mails (default: sendmail)'
-    print
     print 'keys options:'
     print '--status            display the key status for the clients (default)'
     print '--print             display the authorization keys'
@@ -816,10 +812,14 @@
                 error('A main configuration file can be specified only once!')
                 sys.exit(2)
         elif o in ('-e', '--email'):
+            warn('The -e/--email options are deprecated and will be removed in the future')
+            warn('Please use the /etc/safekeep/safekeep.conf file instead')
             email.append(a)
         elif o in ('-h', '--help'):
             usage(0)
         elif o in ('-s', '--smtp'):
+            warn('The -s/--smtp options are deprecated and will be removed in the future')
+            warn('Please use the /etc/safekeep/safekeep.conf file instead')
             smtp = a
         elif o in ('--server', ):
             if mode: usage(2)


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