[Pkg-privacy-commits] [onionbalance] 95/117: Fix paths for the CLI tool help messages

[Donncha O'Cearbahill]

This is an automated email from the git hooks/post-receive script.

donncha-guest pushed a commit to branch debian/sid
in repository onionbalance.

commit 20a67dc1167814ab4c54abf123823bdda2f40227
Author: Donncha O'Cearbhaill <donncha at donncha.is>
Date:   Wed Oct 7 14:59:22 2015 +0200

    Fix paths for the CLI tool help messages
    
    Replace the path to the onionbalance and onionbalance-config
    executables with just the name of the executables. Adds a more descriptive
    log message when onionbalance cannot find a configuration file.
---
 onionbalance/manager.py  |  6 +++---
 onionbalance/settings.py | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/onionbalance/manager.py b/onionbalance/manager.py
index e4e0a89..7b7f66e 100644
--- a/onionbalance/manager.py
+++ b/onionbalance/manager.py
@@ -31,8 +31,8 @@ def parse_cmd_args():
     """
 
     parser = argparse.ArgumentParser(
-        description="%s distributes the requests for a Tor hidden services "
-        "across multiple (remote) Tor instances." % sys.argv[0])
+        description="onionbalance distributes the requests for a Tor hidden "
+        "services across multiple Tor instances.")
 
     parser.add_argument("-i", "--ip", type=str, default="127.0.0.1",
                         help="Tor controller IP address")
@@ -41,7 +41,7 @@ def parse_cmd_args():
                         help="Tor controller port")
 
     parser.add_argument("-c", "--config", type=str,
-                        default="config.yaml", help="Config file")
+                        default="config.yaml", help="Config file location")
 
     parser.add_argument("-v", "--verbosity", type=str, default="info",
                         help="Minimum verbosity level for logging.  Available "
diff --git a/onionbalance/settings.py b/onionbalance/settings.py
index 4e9eed1..e39bbb0 100644
--- a/onionbalance/settings.py
+++ b/onionbalance/settings.py
@@ -35,8 +35,9 @@ def parse_config_file(config_file):
             config_data = yaml.load(handle.read())
             logger.info("Loaded the config file '%s'.", config_path)
     else:
-        logger.error("The specified config file '%s' does not exist.",
-                     config_path)
+        logger.error("The specified config file '%s' does not exist. The "
+                     "onionbalance-config tool can generate the required "
+                     "keys and config files.", config_path)
         sys.exit(1)
 
     # Rewrite relative paths in the config to be relative to the config
@@ -111,9 +112,9 @@ def parse_cmd_args():
     """
 
     parser = argparse.ArgumentParser(
-        description="%s generates config files and keys for OnionBalance "
-        "instances and managment servers. Calling without any options will"
-        "initiate an interactive mode." % sys.argv[0])
+        description="onionbalance-config generates config files and keys for "
+        "OnionBalance instances and management servers. Calling without any "
+        "options will initiate an interactive mode.")
 
     parser.add_argument("--key", type=str, default=None,
                         help="RSA private key for the master onion service.")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionbalance.git