diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-22 21:48:27 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-10-22 21:48:27 +0000 |
| commit | 960d4d245dfecab6fd41ab82b59b2e10c0a40946 (patch) | |
| tree | bc2fdc036a24ea237b3dd1f21268c450992d0db1 | |
| parent | 583958a8947777012bfca6f24b2893e39879e9d0 (diff) | |
* revert patch from patch-59, causes all sorts of trouble
| -rw-r--r-- | apt-pkg/pkgrecords.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/pkgrecords.h | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 1d71d3e2f..9c2655d6a 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) if (Files[I->ID] == 0) return; } - // We store that to make sure that the destructor won't segfault, - // even if the Cache object was destructed before this instance. - PackageFileCount = Cache.HeaderP->PackageFileCount; } /*}}}*/ // Records::~pkgRecords - Destructor /*{{{*/ @@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) /* */ pkgRecords::~pkgRecords() { - for (unsigned I = 0; I != PackageFileCount; I++) + for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++) delete Files[I]; delete [] Files; } diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index f31e83afe..08f004414 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -33,7 +33,6 @@ class pkgRecords pkgCache &Cache; Parser **Files; - int PackageFileCount; public: diff --git a/debian/changelog b/debian/changelog index 090f1f843..3bbbf3b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -apt (0.6.43) unstable; urgency=low +apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page (thanks to Filipus Klutiero, closes: #282918) + * apt-pkg/pkgrecords.cc: + - revert patch from last version, it causes trouble on alpha + and ia64 (closes: #335102, #335103,#335213) - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Oct 2005 11:23:42 +0200 + -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200 apt (0.6.42) unstable; urgency=low |