Fix default conf file name, revert to previous name

[mpd-sima.git] / sima / utils / startopt.py

diff --git a/sima/utils/startopt.py b/sima/utils/startopt.py
index 988e67d336f1c5453e61fa7f3c930ae1e77c3470..ef2032c13b0f013c1fecc3a5b0fd4ee21c3e7bc3 100644 (file)
--- a/sima/utils/startopt.py
+++ b/sima/utils/startopt.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2010, 2011, 2012, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -19,11 +19,10 @@
 #
 #
 
-import sys
 from argparse import (ArgumentParser, SUPPRESS)
 
 
-from .utils import Obsolete, Wfile, Rfile, Wdir
+from .utils import Wfile, Rfile, Wdir
 
 USAGE = """USAGE:  %prog [--help] [options]"""
 DESCRIPTION = """
@@ -60,7 +59,7 @@ OPTS = [
         'type': str,
         'dest': 'verbosity',
         'choices': ['debug', 'info', 'warning', 'error'],
-        'help': 'file to log message to, default is stdout/stderr'},
+        'help': 'Log messages verbosity, default is info'},
     {
         'sw': ['-p', '--pid'],
         'dest': 'pidfile',
@@ -89,7 +88,7 @@ OPTS = [
         'sw':['--var_dir'],
         'dest': 'var_dir',
         'action': Wdir,
-        'help': 'Directory to store var content (ie. database)'},
+        'help': 'Directory to store var content (ie. database, cache)'},
     {
         'sw': ['--create-db'],
         'action': 'store_true',
@@ -115,6 +114,7 @@ class StartOpt(object):
     """
 
     def __init__(self, script_info,):
+        self.parser = None
         self.info = dict(script_info)
         self.options = dict()
         self.main()
@@ -125,7 +125,7 @@ class StartOpt(object):
         """
         self.parser = ArgumentParser(description=DESCRIPTION,
                                    usage='%(prog)s [options]',
-                                   prog='mpd_sima',
+                                   prog=self.info.get('prog'),
                                    epilog='Happy Listening',
                 )
         self.parser.add_argument('--version', action='version',