Просмотр исходного кода

* cmdline/apt-get.cc:
- fix in the task-install code

Michael Vogt лет назад: 19
Родитель
Сommit
db8dfd2eee
2 измененных файлов с 7 добавлено и 3 удалено
  1. 1 2
      cmdline/apt-get.cc
  2. 6 1
      debian/changelog

+ 1 - 2
cmdline/apt-get.cc

@@ -1519,8 +1519,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
 
 
    // build regexp for the task
    // build regexp for the task
    char S[300];
    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);
    regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
    
    
    bool found = false;
    bool found = false;

+ 6 - 1
debian/changelog

@@ -1,8 +1,13 @@
 apt (0.7.4) UNRELEASED; urgency=low
 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)
   * 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
 apt (0.7.3) unstable; urgency=low