merge with lp:apt/debian-sid

Remove a bug (= an evil amok running if) introduced by the merge in 1817
which cause a segfault in the destructor for the dynamic mmap.

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 917466c2f98a883dd634d640ac1a54fede3a762a..aa52b4c3066ef923ee5c622a98f77a21c0714622 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -201,7 +201,7 @@ DynamicMMap::~DynamicMMap()
    if (Fd == 0)
    {
 #ifdef _POSIX_MAPPED_FILES
-      if(munmap(Base, WorkSpace) < 0)
+      munmap(Base, WorkSpace);
 #else
       delete [] (unsigned char *)Base;
 #endif

diff --git a/po/apt-all.pot b/po/apt-all.pot
index c2cd5e9d7bd303f9db63a120be2343556465b1c9..a1864629031088d089e2754e6e0a0009130d2521 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 18:36+0200\n"
+"POT-Creation-Date: 2009-07-26 01:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"