From b7f32003140cce0188e8a2fc66368a860e474a44 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 22 Apr 2009 01:02:26 +0000 Subject: Checkpointing APT notes and fixed a minor error issue in new memory map code. git-svn-id: http://svn.telesphoreo.org/trunk@600 514c082c-b64e-11dc-b46d-3d985efe055d --- data/apt/_metadata/notes | 2 ++ data/apt/mmap.diff | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 data/apt/_metadata/notes diff --git a/data/apt/_metadata/notes b/data/apt/_metadata/notes new file mode 100644 index 000000000..616ed7297 --- /dev/null +++ b/data/apt/_metadata/notes @@ -0,0 +1,2 @@ +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=146877 +pkgIndexFile::CheckLanguageCode doesn't handle the common cases diff --git a/data/apt/mmap.diff b/data/apt/mmap.diff index 0184c380c..06f4dbac0 100644 --- a/data/apt/mmap.diff +++ b/data/apt/mmap.diff @@ -1,7 +1,7 @@ diff -ru apt-0.7.20.2/apt-pkg/tagfile.cc apt-0.7.20.2+iPhone/apt-pkg/tagfile.cc --- apt-0.7.20.2/apt-pkg/tagfile.cc 2009-04-19 02:42:49.000000000 +0000 +++ apt-0.7.20.2+iPhone/apt-pkg/tagfile.cc 2009-04-19 03:28:33.000000000 +0000 -@@ -28,11 +28,11 @@ +@@ -28,11 +28,12 @@ // --------------------------------------------------------------------- /* */ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : @@ -12,6 +12,7 @@ diff -ru apt-0.7.20.2/apt-pkg/tagfile.cc apt-0.7.20.2+iPhone/apt-pkg/tagfile.cc - if (Fd.IsOpen() == false) + if (Fd.IsOpen() == false || Fd.Size() == 0) { ++ _error->Discard(); + Map = NULL; Buffer = 0; Start = End = Buffer = 0; -- cgit v1.2.3