summaryrefslogtreecommitdiff
path: root/apt-private/private-list.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 14:39:27 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 14:39:27 +0100
commite2264d3f957694e229a9f6976fc136b8f82ad770 (patch)
treec1f0b9c64d1d60defe5ce1a89c6bc136d758a772 /apt-private/private-list.cc
parentfd4e73c33c20873af670ee40b549c46ee0d50801 (diff)
parentc9a5f74bd57fa4fcf4e30cade8e48c5635448689 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'apt-private/private-list.cc')
-rw-r--r--apt-private/private-list.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 08851eb7e..a02ebf02d 100644
--- 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;
- 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);
@@ -145,7 +145,7 @@ bool List(CommandLine &Cmd)
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>(