From db8dfd2eeeaf9c1a208a31b3d2b1a930e63f3b9b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Jul 2007 23:21:07 +0100 Subject: * cmdline/apt-get.cc: - fix in the task-install code --- cmdline/apt-get.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmdline/apt-get.cc') 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; -- cgit v1.2.3 From f03dd1e032139356f1e5b7f19fb76482ae05e311 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 12 Jul 2007 16:49:43 +0100 Subject: - fix in the task-install code regexp (thanks to Adam Conrad and Colin Watson) --- cmdline/apt-get.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmdline/apt-get.cc') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ed4d5ce5f..95600ff6d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,8 +1519,9 @@ 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); - regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) + return _error->Error("Failed to compile task regexp"); bool found = false; bool res = true; -- cgit v1.2.3