summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-cache.cc5
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog36
3 files changed, 21 insertions, 22 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0014563b8..aea9ebeba 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1574,10 +1574,11 @@ bool Madison(CommandLine &CmdL)
pkgCache &Cache = *GCache;
- // Create the text record parsers
+ // Create the src text record parsers and ignore errors about missing
+ // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
pkgSrcRecords SrcRecs(*SrcList);
if (_error->PendingError() == true)
- return false;
+ _error->Discard();
for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 837094ee0..d4a6bee32 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1368,7 +1368,7 @@ bool DoUpdate(CommandLine &CmdL)
}
// Clean out any old list files
- if (_config->FindB("APT::Get::List-Cleanup",true) == true)
+ if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true)
{
if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
diff --git a/debian/changelog b/debian/changelog
index 544c5b9da..92a4671f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,20 @@
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
- * ca.po: Completed to 512t. Closes: #351592
- * eu.po: Completed to 512t. Closes: #350483
- * ja.po: Completed to 512t. Closes: #349806
- * pl.po: Completed to 512t. Closes: #349514
- * sk.po: Completed to 512t. Closes: #349474
- * gl.po: Completed to 512 strings
- Closes: #349407
- * vi.po: Completed to 512 strings
- * sv.po: Completed to 512 strings
- Closes: #349210
- * ru.po: Completed to 512 strings
- Closes: #349154
- * da.po: Completed to 512 strings
- Closes: #349084
- * fr.po: Completed to 512 strings
- * LINGUAS: Add Welsh
- * *.po: Updated from sources (512 strings)
- * vi.po: Completed to 511 strings
- Closes: #348968
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
@@ -27,6 +22,9 @@ apt (0.6.43.3) unstable; urgency=low
- don't lock the lists directory in DoInstall, breaks --print-uri
(thanks to James Troup for reporting it)
* debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
--