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

* Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)

* cmdline/apt-get.cc:
  - fix in the task-install code
Michael Vogt лет назад: 19
Родитель
Сommit
50ccb2f437
2 измененных файлов с 13 добавлено и 3 удалено
  1. 1 2
      cmdline/apt-get.cc
  2. 12 1
      debian/changelog

+ 1 - 2
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;

+ 12 - 1
debian/changelog

@@ -1,3 +1,14 @@
+apt (0.7.2ubuntu8) UNRELEASED; urgency=low
+
+  [Otavio Salvador]
+  * 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
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Jul 2007 23:20:15 +0100
+
 apt (0.7.2ubuntu7) gutsy; urgency=low
 
   * fix build-dependencies 
@@ -29,7 +40,7 @@ apt (0.7.2ubuntu6) gutsy; urgency=low
 
  -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 09 Jul 2007 01:15:57 +1000
 
-pt (0.7.2ubuntu5) gutsy; urgency=low
+apt (0.7.2ubuntu5) gutsy; urgency=low
 
   * Rerun autoconf to fix the FTBFS.