← Back to branch summary

~ubuntu-branches/debian/experimental/apt/experimental

« back to all changes in this revision

Viewing changes to apt-private/private-list.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, Colin Watson, Michael Vogt
  • Date: 2013-11-29 20:50:17 UTC
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131129205017-xzvq5coc1tv4u8vd
Tags: 0.9.13.1
http://bugs.debian.org/720597
http://bugs.debian.org/730490
https://launchpad.net/bugs/1255806
http://bugs.debian.org/709560
http://bugs.debian.org/730795
https://launchpad.net/bugs/1254499
[ Colin Watson ]
* fix "apt-get  --purge build-dep" (closes: #720597)
* fix regression that APT::Keep-Fds is not honored (closes: #730490)

[ Michael Vogt ]
* add "-f" option to "build-dep" as sbuild is using it to fix 
  regression with cross-building (LP: #1255806)
* add autopkgtest support for the integration testsuite
* merge mvo/feature/short-list
* merge mvo/feature/edit-sources
* fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560)
* reset terminal on error (closes: #730795)
* fix apport report writing (LP: #1254499)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-private/private-list.cc
69
69
            cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
70
70
#else
71
71
         APT::CacheFilter::PackageMatcher *cachefilter = NULL;
72
 
         if(_config->FindB("APT::Cmd::UseRegexp", false) == true)
 
72
         if(_config->FindB("APT::Cmd::Use-Regexp", false) == true)
73
73
            cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
74
74
         else
75
75
            cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
132
132
   std::map<std::string, std::string> output_map;
133
133
   std::map<std::string, std::string>::const_iterator K;
134
134
 
 
135
   bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary");
 
136
 
135
137
   PackageNameMatcher matcher(patterns);
136
138
   LocalitySortedVersionSet bag;
137
139
   OpTextProgress progress;
143
145
   for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
144
146
   {
145
147
      std::stringstream outs;
146
 
      if(_config->FindB("APT::Cmd::AllVersions", false) == true)
 
148
      if(_config->FindB("APT::Cmd::All-Versions", false) == true)
147
149
      {
148
150
         ListAllVersions(CacheFile, records, V.ParentPkg(), outs);
149
151
         output_map.insert(std::make_pair<std::string, std::string>(
150
152
            V.ParentPkg().Name(), outs.str()));
151
153
      } else {
152
 
         ListSingleVersion(CacheFile, records, V, outs);
 
154
         ListSingleVersion(CacheFile, records, V, outs, includeSummary);
153
155
         output_map.insert(std::make_pair<std::string, std::string>(
154
156
                           V.ParentPkg().Name(), outs.str()));
155
157
      }