diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
| commit | 9397ea947c23c0957a683152360909810340abce (patch) | |
| tree | 6b29e35b9ef602c15d0aab20eefdec3138eb4692 /apt-pkg/acquire-item.h | |
| parent | 87ecd6a2d719aeaeedd99dd500b467e966376f1c (diff) | |
| parent | 6e2261d0f250406058d66b360080aa986953ae19 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more-acquire-guessing
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'apt-pkg/acquire-item.h')
| -rw-r--r-- | apt-pkg/acquire-item.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 7adc1976b..10d7e6a09 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -63,6 +63,8 @@ class pkgAcqMetaBase; */ class pkgAcquire::Item : public WeakPointable { + friend class pkgAcqMetaBase; + void *d; protected: @@ -323,6 +325,7 @@ class pkgAcquire::Item : public WeakPointable InvalidFormat, SignatureError, NotClearsigned, + MaximumSizeExceeded }; /** \brief Rename failed file and set error |