← Back to branch summary

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

« back to all changes in this revision

Viewing changes to apt-pkg/indexfile.h

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, David Kalnischkies, Steve Langasek, Michael Vogt
  • Date: 2013-12-07 14:54:31 UTC
  • mto: This revision was merged to the branch mainline in revision 50.
  • Revision ID: package-import@ubuntu.com-20131207145431-8av51jnzb9kz20ow
Tags: 0.9.14
http://bugs.debian.org/731102
http://bugs.debian.org/726169
[ David Kalnischkies ]
* merge ubuntus apport reporting changes to reduce diff
* enable NOISE for build logs to enable analyse
* introduce a vendor system to change sources.list
* add a vendor specific file to have configurable entities
* use a substvar to set the archive-keyring in debian/control
* cherry-pick ubuntus (disabled) net-update fixes
* generate apt-key script with vendor info about keys
* drop old /var/state to /var/lib transition artefacts

[ Steve Langasek ]
* prepare-release: declare the packages needed as source build deps.

[ Michael Vogt ]
* enable release based selection for deb-src (closes: 731102)
* document Dpkg::Progress-Fancy (closes: 726169), thanks to James McCoy
* vendor/makefile: fix build error for parallel builds
* Handle SIGWINCH in APT::Progress-Fancy=1

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/indexfile.h
78
78
   virtual bool Exists() const = 0;
79
79
   virtual bool HasPackages() const = 0;
80
80
   virtual unsigned long Size() const = 0;
81
 
   virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; };
 
81
   virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* Prog) const { return false; };
82
82
   __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const
83
83
      { return Merge(Gen, &Prog); };
84
 
   virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;};
 
84
   virtual bool MergeFileProvides(pkgCacheGenerator &Gen,OpProgress* Prog) const {return true;};
85
85
   __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const
86
86
      {return MergeFileProvides(Gen, &Prog);};
87
87
   virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;