diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-20 18:42:51 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-20 18:42:51 +0000 |
| commit | dd759349ecdd83d13cd1fc67294068c90a5984ea (patch) | |
| tree | 58836bbcf03233b50b78fa4139f2ea93e1a0c785 /cmdline | |
| parent | 5e972bffae68a75aafc9f9b639e82e252fde3b8b (diff) | |
| parent | 7f016f53293f9c8c149debd2b84b1efd4d9cc827 (diff) | |
* merged with mainline
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132
* make apt-cache madion wotk without deb-src lines
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133
* only clean out the list dir if the update was successful
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cache.cc | 5 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 |
2 files changed, 4 insertions, 3 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) |