Description of problem: Unpatched bug for boost_program_options regarding ambiguous options. http://lists.alioth.debian.org/pipermail/pkg-boost-devel/2006-January/000334.html Version-Release number of selected component (if applicable): 1.33.1 How reproducible: As per above URL Actual results: Runtime ambigous option error. Expected results: Additional info: The following patch (altered from debian) fixes things: --- libs/program_options/src/options_description.cpp +++ libs/program_options/src/options_description.cpp @@ -53,10 +53,10 @@ { } - bool + option_description::match_result option_description::match(const std::string& option, bool approx) const { - bool result = false; + match_result result = no_match; if (!m_long_name.empty()) { if (*m_long_name.rbegin() == '*') @@ -65,23 +65,26 @@ // prefix is OK. if (option.find(m_long_name.substr(0, m_long_name.length()-1)) == 0) - result = true; + result = approximate_match; } if (approx) { if (m_long_name.find(option) == 0) - result = true; + if (m_long_name == option) + result = full_match; + else + result = approximate_match; } else { if (m_long_name == option) - result = true; + result = full_match; } } if (m_short_name == option) - result = true; + result = full_match; return result; } @@ -258,21 +261,38 @@ // case sensitivity and trailing '*' and so we can't use simple map. for(unsigned i = 0; i < m_options.size(); ++i) { - if (m_options[i]->match(name, approx)) + option_description::match_result r = + m_options[i]->match(name, approx); + + if (r == option_description::no_match) + continue; + + // If we have a full patch, and an approximate match, + // ignore approximate match instead of reporting error. + // Say, if we have options "all" and "all-chroots", then + // "--all" on the command line should select the first one, + // without ambiguity. + // + // For now, we don't check the situation when there are + // two full matches. + + if (r == option_description::full_match) { - if (found != -1) - { - vector<string> alts; - // FIXME: the use of 'key' here might not - // be the best approach. - alts.push_back(m_options[found]->key(name)); - alts.push_back(m_options[i]->key(name)); - boost::throw_exception(ambiguous_option(name, alts)); - } - else - { - found = i; - } + return m_options[i].get(); + } + + if (found != -1) + { + vector<string> alts; + // FIXME: the use of 'key' here might not + // be the best approach. + alts.push_back(m_options[found]->key(name)); + alts.push_back(m_options[i]->key(name)); + boost::throw_exception(ambiguous_option(name, alts)); + } + else + { + found = i; } } if (found != -1) { --- libs/program_options/test/options_description_test.cpp +++ libs/program_options/test/options_description_test.cpp @@ -20,11 +20,20 @@ { options_description desc; desc.add_options() - ("foo", new untyped_value()) - ("fee", new untyped_value()) - ("baz", new untyped_value()); + ("foo", new untyped_value()) + ("fee", new untyped_value()) + ("baz", new untyped_value()) + ("all", new untyped_value()) + ("all-chroots", new untyped_value()) + ("all-sessions", new untyped_value()) + ; BOOST_CHECK_EQUAL(desc.find("fo", true).long_name(), "foo"); + + BOOST_CHECK_EQUAL(desc.find("all", true).long_name(), "all"); + BOOST_CHECK_EQUAL(desc.find("all-ch", true).long_name(), "all-chroots"); + + // BOOST_CHECK(desc.count_approx("foo") == 1); // set<string> a = desc.approximations("f"); // BOOST_CHECK(a.size() == 2); --- boost/program_options/options_description.hpp +++ boost/program_options/options_description.hpp @@ -78,10 +78,12 @@ virtual ~option_description(); + enum match_result { no_match, full_match, approximate_match }; + /** Given 'option', specified in the input source, return 'true' is 'option' specifies *this. */ - bool match(const std::string& option, bool approx) const; + match_result match(const std::string& option, bool approx) const; /** Return the key that should identify the option, in particular in the variables_map class.
This really needs to be fixed. It bit me again on another Fedora 7 release today. The patch provided fixes the issue and something similar needs to be merged.
Thanks for the patch. I submitted the fixed package for push to testing repository.
boost-1.33.1-14.fc7 has been pushed to the Fedora 7 testing repository. If problems still persist, please make note of it in this bug report. If you want to test the update, you can install it with su -c 'yum --enablerepo=updates-testing update boost'
This message is a reminder that Fedora 7 is nearing the end of life. Approximately 30 (thirty) days from now Fedora will stop maintaining and issuing updates for Fedora 7. It is Fedora's policy to close all bug reports from releases that are no longer maintained. At that time this bug will be closed as WONTFIX if it remains open with a Fedora 'version' of '7'. Package Maintainer: If you wish for this bug to remain open because you plan to fix it in a currently maintained version, simply change the 'version' to a later Fedora version prior to Fedora 7's end of life. Bug Reporter: Thank you for reporting this issue and we are sorry that we may not be able to fix it before Fedora 7 is end of life. If you would still like to see this bug fixed and are able to reproduce it against a later version of Fedora please change the 'version' of this bug. If you are unable to change the version, please add a comment here and someone will do it for you. Although we aim to fix as many bugs as possible during every release's lifetime, sometimes those efforts are overtaken by events. Often a more recent Fedora release includes newer upstream software that fixes bugs or makes them obsolete. If possible, it is recommended that you try the newest available Fedora distribution to see if your bug still exists. Please read the Release Notes for the newest Fedora distribution to make sure it will meet your needs: http://docs.fedoraproject.org/release-notes/ The process we are following is described here: http://fedoraproject.org/wiki/BugZappers/HouseKeeping
Fedora 7 changed to end-of-life (EOL) status on June 13, 2008. Fedora 7 is no longer maintained, which means that it will not receive any further security or bug fix updates. As a result we are closing this bug. If you can reproduce this bug against a currently maintained version of Fedora please feel free to reopen this bug against that version. Thank you for reporting this bug and we are sorry it could not be fixed.