From a546101c245d4096961e0917c9aa9ab937b6e0ae Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Feb 2006 10:19:02 +0000 Subject: * fix regression about not working --print-uris in "install" --- cmdline/apt-get.cc | 9 --------- 1 file changed, 9 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index abeb57c6f..837094ee0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1411,15 +1411,6 @@ bool DoUpgrade(CommandLine &CmdL) /* Install named packages */ bool DoInstall(CommandLine &CmdL) { - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) -- cgit v1.2.3 From 03cd434bba10c0087f633e5741a585ba7292451b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 13 Feb 2006 15:48:25 +0000 Subject: * make apt-cache madion wotk without deb-src lines --- cmdline/apt-cache.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmdline') 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++) { -- cgit v1.2.3 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdline') 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) -- cgit v1.2.3