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

* cmdline/apt-get.cc:
- fix InstallTask code when a pkgRecord ends
with a single '\n' (thanks to Soren Hansen for reporting)

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

+ 1 - 1
cmdline/apt-get.cc

@@ -1519,7 +1519,7 @@ 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);
+   snprintf(S, sizeof(S), "^Task:.*[^a-z\n]%s[^a-z].*$", taskname);
    regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
    
    bool found = false;

+ 3 - 0
debian/changelog

@@ -4,6 +4,9 @@ apt (0.7.3) unstable; urgency=low
     Daniel Burrows, closes: #429378)
   * fix FTFBFS by changing build-depends to
     libcurl4-gnutls-dev (closes: #428363)
+  * cmdline/apt-get.cc:
+    - fix InstallTask code when a pkgRecord ends 
+      with a single '\n' (thanks to Soren Hansen for reporting)
 
  --