diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-27 13:34:34 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-27 13:34:34 +0200 |
| commit | 541c83b92a4919ba0aed6150f71e227d07f93a02 (patch) | |
| tree | 8a81952abc540e5d5a787f77f6d5ed32226abc80 | |
| parent | 9e830fd5e9c71c384275f0c63dfe80595723d614 (diff) | |
* cmdline/apt-get.cc:
- fix InstallTask code when a pkgRecord ends
with a single '\n' (thanks to Soren Hansen for reporting)
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 51bcfde12..974427f51 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,7 +1519,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname); + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); bool found = false; diff --git a/debian/changelog b/debian/changelog index 50c050dcb..84cf54d75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.2ubuntu3) gutsy; urgency=low + + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200 + apt (0.7.2ubuntu2) gutsy; urgency=low * fixed compile errors with g++ 7.3 (thanks to |