diff options
| author | bubulle@debian.org <> | 2006-03-12 21:18:45 +0100 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-03-12 21:18:45 +0100 |
| commit | a3c8f91f032961aca236f29af646170843a06730 (patch) | |
| tree | cb11505f666d3f5ba23be9c6d30086fe29dab977 /cmdline | |
| parent | 54a14f507b63236ce8c94bb92a835be0cfd161dd (diff) | |
| parent | ad97ee36860c237427dc38ac8ef7f537ac275d77 (diff) | |
Merge from Michael tree
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cache.cc | 5 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 11 |
2 files changed, 4 insertions, 12 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 abeb57c6f..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) @@ -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) |