diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2014-02-02 17:58:56 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2014-02-02 17:58:56 +0900 |
| commit | 7d1aa887ee5f00ecdfe8a7d8f71becf81018e55e (patch) | |
| tree | 63af1699e022784517585df5fd945d325952fcad /src/OptionHandlerImpl.cc | |
| parent | 7f6987a4b4950e77597fd1a4fd5d8c60e6209f07 (diff) | |
Add future deprecation warning to --rpc-user and --rpc-passwd
Diffstat (limited to 'src/OptionHandlerImpl.cc')
| -rw-r--r-- | src/OptionHandlerImpl.cc | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/OptionHandlerImpl.cc b/src/OptionHandlerImpl.cc index 69a0d677..939625c2 100644 --- a/src/OptionHandlerImpl.cc +++ b/src/OptionHandlerImpl.cc @@ -578,8 +578,13 @@ std::string PrioritizePieceOptionHandler::createPossibleValuesString() const DeprecatedOptionHandler::DeprecatedOptionHandler (OptionHandler* depOptHandler, - const OptionHandler* repOptHandler) - : depOptHandler_(depOptHandler), repOptHandler_(repOptHandler) + const OptionHandler* repOptHandler, + bool stillWork, + std::string additionalMessage) + : depOptHandler_(depOptHandler), + repOptHandler_(repOptHandler), + stillWork_(stillWork), + additionalMessage_(std::move(additionalMessage)) { depOptHandler_->addTag(TAG_DEPRECATED); } @@ -594,13 +599,21 @@ void DeprecatedOptionHandler::parse(Option& option, const std::string& arg) const { if(repOptHandler_) { - A2_LOG_WARN(fmt(_("--%s option is deprecated. Use --%s option instead."), + A2_LOG_WARN(fmt(_("--%s option is deprecated. Use --%s option instead. %s"), depOptHandler_->getName(), - repOptHandler_->getName())); + repOptHandler_->getName(), + additionalMessage_.c_str())); repOptHandler_->parse(option, arg); + } else if(stillWork_) { + A2_LOG_WARN(fmt(_("--%s option will be deprecated in the future release. " + "%s"), + depOptHandler_->getName(), + additionalMessage_.c_str())); + depOptHandler_->parse(option, arg); } else { - A2_LOG_WARN(fmt(_("--%s option is deprecated."), - depOptHandler_->getName())); + A2_LOG_WARN(fmt(_("--%s option is deprecated. %s"), + depOptHandler_->getName(), + additionalMessage_.c_str())); } } |