summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog3
2 files changed, 4 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..6196e02ba 100644
--- a/debian/changelog
+++ b/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)
--