From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 18 Sep 2007 16:46:03 +0000 (+0100)
Subject: * apt-pkg/deb/dpkgpm.cc:
X-Git-Tag: 0.7.24ubuntu1~139
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c9034b42ab8da606fc0214dbad54025fc4b586af?hp=--cc

* apt-pkg/deb/dpkgpm.cc:
  - fix parse error when dpkg sends unexpected data
---

c9034b42ab8da606fc0214dbad54025fc4b586af
diff --cc apt-pkg/deb/dpkgpm.cc
index 7e1933f06,28b895ac7..e1e26e903
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -401,6 -398,9 +399,8 @@@ void pkgDPkgPM::ProcessDpkgStatusLine(i
  	 std::clog << "ignoring line: not enough ':'" << std::endl;
        return;
     }
 -   char *action = list[0];
+    char *pkg = list[1];
+    char *action = _strstrip(list[2]);
  
     if(strncmp(action,"error",strlen("error")) == 0)
     {
diff --cc configure.in
index 355129dea,0294b9ae7..6ffc99f56
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu9")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.5")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu10")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index a53b68501,46b6dc7bf..effaed1f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,81 -1,4 +1,88 @@@
 -apt (0.7.7) UNRELEASED; urgency=low
++apt (0.7.6ubuntu10) gutsy; urgency=low
++
++  * apt-pkg/deb/dpkgpm.cc:
++    - fix parse error when dpkg sends unexpected data
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Sep 2007 17:25:09 +0100
++
 +apt (0.7.6ubuntu9) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix progress reporting precent calculation (LP: #137798)
 +  * make apt build with g++ 4.3
 +  * fix missing SetExecClose() call when the status-fd is used
 +    (LP: #136767)
 +  * debian/apt.cron.daily:
 +    - move unattended-upgrade before apt-get autoclean
 +  * fix "purge" commandline argument, closes LP: #125733
 +    (thanks to Julien Danjou for the patch)
 +  * cmdline/apt-get.cc:
 +    - do not change the auto-installed information if a package
 +      is reinstalled (LP: #139448)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 +
 +apt (0.7.6ubuntu8) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.{cc,h}:
 +    - fix bug in dpkg log writing when a signal is caught during
 +      select() (LP: #134858)
 +    - write end marker in the log as well
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Sep 2007 15:03:46 +0200
 +
 +apt (0.7.6ubuntu7) gutsy; urgency=low
 +
 +  * reupload to fix FTBFS
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Aug 2007 19:44:20 +0200
 +
 +apt (0.7.6ubuntu6) gutsy; urgency=low
 +
 +  * dpkg-triggers: Deal properly with new package states.
 +
 + -- Ian Jackson <iwj@ubuntu.com>  Wed, 15 Aug 2007 20:44:37 +0100
 +
 +apt (0.7.6ubuntu5) UNRELEASED; urgency=low
 +
 +  * apt-pkg/acquire-item.cc:
 +    - fix file removal on local repo i-m-s hit (LP: #131166)
 +  * tests/local-repo:
 +    - added regression test for this bug
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Aug 2007 12:34:07 +0200
 +
 +apt (0.7.6ubuntu4) gutsy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - remove YnPrompt when a XS-Vcs- tag is found, improve the
 +      notice (LP: #129575)
 +  * methods/copy.cc:
 +    - take hashes here too
 +  * apt-pkg/acquire-worker.cc:
 +    - only pass on computed hash if we recived one from the method
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Aug 2007 19:30:29 +0200
 +
 +apt (0.7.6ubuntu3) gutsy; urgency=low
 +
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - fix packagename extraction when writting apport reports
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase default mmap size (LP: #125640)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Aug 2007 09:52:00 +0200
 +
 +apt (0.7.6ubuntu2) gutsy; urgency=low
 +
 +  * doc/examples/sources.list:
 +    - change example source to gutsy
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - do not break if no /dev/pts is available
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 06 Aug 2007 15:17:57 +0200
 +
 +apt (0.7.6ubuntu1) gutsy; urgency=low
  
    [ Michael Vogt ]
    * apt-inst/contrib/extracttar.cc: