- fix in the task-install code regexp (thanks to Adam Conrad and

    Colin Watson)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ed4d5ce5f57adc55d19be8c8c0b4279d6ba183a5..95600ff6d37ea31487585c6071b43ee5753f1a18 100644 (file)
--- 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];
 
    // 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;
    
    bool found = false;
    bool res = true;

diff --git a/configure.in b/configure.in
index 4daa0ab780bc73e7464e305a08bd07be5b2cac0e..9bb1a8baf80105dbaa3accad36d912f44869d03a 100644 (file)
--- 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_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)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 2703b98cfb163691c033acd51c4fbb038788e5ef..d18c19d0c81c6e5afa648b55b7720ece2342a6f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ apt (0.7.4) UNRELEASED; urgency=low
 
   [Michael Vogt]
   * cmdline/apt-get.cc:
 
   [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:
   [Otavio Salvador]
   * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
   * Fix compilation warnings: