diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-11 23:25:35 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-11 23:25:35 +0100 |
| commit | 50ccb2f437daabf5d4c7eb5322a5ed11374cd048 (patch) | |
| tree | 1f8cb6d539990ea788d37d60d92026057e983a4e | |
| parent | 89b52526ec245cacdbac1b4aee6c877dc9a410e4 (diff) | |
| parent | db8dfd2eeeaf9c1a208a31b3d2b1a930e63f3b9b (diff) | |
* Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
* cmdline/apt-get.cc:
- fix in the task-install code
| -rw-r--r-- | cmdline/apt-get.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index aaa419855..2e5779070 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,8 +1519,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - // better: "^Task:.*[^a-z]lamp-server([^a-z]|\n)" ? - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s([^a-z]|\n|$)", taskname); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); bool found = false; diff --git a/debian/changelog b/debian/changelog index cefcef4ae..359d7c291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.7.2ubuntu8) UNRELEASED; urgency=low + + [Otavio Salvador] + * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + + [Michael Vogt] + * cmdline/apt-get.cc: + - fix in the task-install code + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100 + apt (0.7.2ubuntu7) gutsy; urgency=low * fix build-dependencies @@ -29,7 +40,7 @@ apt (0.7.2ubuntu6) gutsy; urgency=low -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000 -pt (0.7.2ubuntu5) gutsy; urgency=low +apt (0.7.2ubuntu5) gutsy; urgency=low * Rerun autoconf to fix the FTBFS. |