summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-07-11 23:21:07 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-07-11 23:21:07 +0100
commitdb8dfd2eeeaf9c1a208a31b3d2b1a930e63f3b9b (patch)
tree4b2c283f968ff9f42b9a7138387268695e214c74
parent6724d2173133f24bc8a3875c13513761f9340627 (diff)
* cmdline/apt-get.cc:
- fix in the task-install code
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--debian/changelog7
2 files changed, 7 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index aa54677be..ed4d5ce5f 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 cb86ce580..907390651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
apt (0.7.4) 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
- -- Otavio Salvador <otavio@ossystems.com.br> Mon, 02 Jul 2007 13:27:54 -0300
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
apt (0.7.3) unstable; urgency=low