rename APT::Cmd::AllVersions -> APT::Cmd::All-Versions, APT::Cmd::UseRegexp -> APT...

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 8ba6629a802d4b26c5e74c187d839e1d47850a70..35d61f318ed2f0c3405b66de6cdfcb1b62532f78 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -222,7 +222,7 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm
    {
       addArg(0,"installed","APT::Cmd::Installed",0);
       addArg(0,"upgradable","APT::Cmd::Upgradable",0);
    {
       addArg(0,"installed","APT::Cmd::Installed",0);
       addArg(0,"upgradable","APT::Cmd::Upgradable",0);

-      addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);
+      addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);

    }
    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {
    }
    else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
    {

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 6993cd797b020d00de140fb6684fdf349c3aad0f..680a9a53515f38931a62d3e55c45d05f27b1b8b3 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -69,7 +69,7 @@ class PackageNameMatcher : public Matcher                             /*{{{*/
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
 #else
          APT::CacheFilter::PackageMatcher *cachefilter = NULL;
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
 #else
          APT::CacheFilter::PackageMatcher *cachefilter = NULL;

-         if(_config->FindB("APT::Cmd::UseRegexp", false) == true)
+         if(_config->FindB("APT::Cmd::Use-Regexp", false) == true)

             cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
          else
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
             cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
          else
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);


@@ -143,7 +143,7 @@ bool List(CommandLine &Cmd)
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
    {
       std::stringstream outs;
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
    {
       std::stringstream outs;

-      if(_config->FindB("APT::Cmd::AllVersions", false) == true)
+      if(_config->FindB("APT::Cmd::All-Versions", false) == true)

       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs);
          output_map.insert(std::make_pair<std::string, std::string>(
       {
          ListAllVersions(CacheFile, records, V.ParentPkg(), outs);
          output_map.insert(std::make_pair<std::string, std::string>(