aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-06-01 11:26:53 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-06-01 11:26:59 +0200
commit8d05ec7bda41a720da16901c510b4cb75e6ab558 (patch)
treea535291c72bd52c21c489a489eb783518434ab30 /src
parent4f1677b6ba9511bc1195b452f47aa5deb51ef2db (diff)
parentaa41bc84b1f11d5afc968376a038d849321a06d2 (diff)
Merge pull request #6164
aa41bc8 Update help message to match the #4219 change (lpescher) f60bb5e Update documentation to match the #4219 change (lpescher) cb87386 Make command line option to show all debugging consistent with similar options (lpescher)
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp2
-rw-r--r--src/util.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index f4136f09e9..2e4740602f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -368,7 +368,7 @@ std::string HelpMessage(HelpMessageMode mode)
if (mode == HMM_BITCOIN_QT)
debugCategories += ", qt";
strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " +
- _("If <category> is not supplied, output all debugging information.") + _("<category> can be:") + " " + debugCategories + ".");
+ _("If <category> is not supplied or if <category> = 1, output all debugging information.") + _("<category> can be:") + " " + debugCategories + ".");
#ifdef ENABLE_WALLET
strUsage += HelpMessageOpt("-gen", strprintf(_("Generate coins (default: %u)"), 0));
strUsage += HelpMessageOpt("-genproclimit=<n>", strprintf(_("Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)"), 1));
diff --git a/src/util.cpp b/src/util.cpp
index bfb95c9044..33b5ee9500 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -208,6 +208,7 @@ bool LogAcceptCategory(const char* category)
// if not debugging everything and not debugging specific category, LogPrint does nothing.
if (setCategories.count(string("")) == 0 &&
+ setCategories.count(string("1")) == 0 &&
setCategories.count(string(category)) == 0)
return false;
}