summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-07-12 16:49:43 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2007-07-12 16:49:43 +0100
commitf03dd1e032139356f1e5b7f19fb76482ae05e311 (patch)
tree9f5c0ce977216ccde69c189a3be3245ed6519fb9 /cmdline
parent74f068b1130384e40a8a80a99a049c105fbe773f (diff)
- fix in the task-install code regexp (thanks to Adam Conrad and
Colin Watson)
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc5
1 files changed, 3 insertions, 2 deletions
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;