commit 73de20de4a69bc055cf23d5852e0ac8b007af1a9 Author: Damian Johnson atagar@torproject.org Date: Sat Sep 24 12:54:39 2011 -0700

fix: clarifying missing armrc message

Occasionally people are confused by the notice that no armrc was loaded, thinking that it's a problem. Trying to clarify the message (it's just supposed to inform users that they can customize arm's behavior). --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/starter.py b/src/starter.py index 4315f06..2347f7b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -94,7 +94,7 @@ DESC_SAVE_FAILED_MSG = "Unable to save configuration descriptions (%s)"

NO_INTERNAL_CFG_MSG = "Failed to load the parsing configuration. This will be problematic for a few things like torrc validation and log duplication detection (%s)" STANDARD_CFG_LOAD_FAILED_MSG = "Failed to load configuration (using defaults): "%s"" -STANDARD_CFG_NOT_FOUND_MSG = "No configuration found at '%s', using defaults" +STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize arm by placing a configuration file at '%s' (see the armrc.sample for its options)."

# torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"]