From 7f016f53293f9c8c149debd2b84b1efd4d9cc827 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Feb 2006 13:27:36 +0000 Subject: * only clean out the list dir if the update was successful --- cmdline/apt-get.cc | 2 +- debian/changelog | 35 ++++++++++++++++------------------- 2 files changed, 17 insertions(+), 20 deletions(-) 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 7042906d2..b6f2a5d0c 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) @@ -28,6 +23,8 @@ apt (0.6.43.3) unstable; urgency=low (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 -- -- cgit v1.2.3