summaryrefslogtreecommitdiff
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
parent74f068b1130384e40a8a80a99a049c105fbe773f (diff)
- fix in the task-install code regexp (thanks to Adam Conrad and
Colin Watson)
-rw-r--r--cmdline/apt-get.cc5
-rw-r--r--configure.in2
-rw-r--r--debian/changelog3
3 files changed, 6 insertions, 4 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;
diff --git a/configure.in b/configure.in
index 4daa0ab78..9bb1a8baf 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.2-0.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.4")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 2703b98cf..d18c19d0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ apt (0.7.4) UNRELEASED; urgency=low
[Michael Vogt]
* cmdline/apt-get.cc:
- - fix in the task-install code
+ - fix in the task-install code regexp (thanks to Adam Conrad and
+ Colin Watson)
[Otavio Salvador]
* Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
* Fix compilation warnings: