diff options
| author | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
| commit | 2830b8436ac8a6f2f3dac4ce2cd030c24eebce04 (patch) | |
| tree | dcdaba1119e595edc8842c2e8746acdf25af6260 /apt-pkg/acquire-item.h | |
| parent | bcc352afa890788825dfbd1454847456748f511f (diff) | |
| parent | 521dd27dc33c8b2a6947a76872841f4254df4e58 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/deb/deblistparser.cc
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
po/da.po
po/mr.po
po/vi.po
Diffstat (limited to 'apt-pkg/acquire-item.h')
| -rw-r--r-- | apt-pkg/acquire-item.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index bf12e48c8..0500a3627 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -694,15 +694,8 @@ class pkgAcqIndex : public pkgAcqBaseIndex */ bool Erase; - /** \brief Verify for correctness by checking if a "Package" - * tag is found in the index. This can be set to - * false for optional index targets - * - */ - // FIXME: instead of a bool it should use a verify string that will - // then be used in the pkgAcqIndex::Done method to ensure that - // the downloaded file contains the expected tag - bool Verify; + // Unused, used to be used to verify that "Packages: " header was there + bool __DELME_ON_NEXT_ABI_BREAK_Verify; /** \brief The object that is actually being fetched (minus any * compression-related extensions). |