diff options
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 554677f39..7aea9edb3 100644 --- a/cmdline/apt-get.cc +++ b/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; diff --git a/debian/changelog b/debian/changelog index ea8113e95..23780b5ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,18 @@ 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) + * merged from Christian Perrier: + * vi.po: completed to 532t, again. Closes: #429899 + * gl.po: completed to 532t. Closes: #429506 + * vi.po: completed to 532t. Closes: #428672 + * Update all PO and the POT. Gives 514t14f4u for formerly + complete translations + * fr.po: completed to 532t + * ku.po, uk.po, LINGUAS: reintegrate those translations + which disappeared from the BZR repositories -- |