diff options
| author | Michael Vogt <mvo@debian.org> | 2006-02-22 09:04:57 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2006-02-22 09:04:57 +0000 |
| commit | 70f87eb01fdbbebedfaac5680020c78ca2da9ad8 (patch) | |
| tree | 0356efdfbd797b569b0139d78dd6511dba8fa0cd /cmdline/apt-get.cc | |
| parent | 011d9176844e1817f1dc64cf61c375ab77646d0e (diff) | |
| parent | 0c1b7be9c1a30fddd72d5b80bb2e566fe379b166 (diff) | |
* synced with mainline
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-167
Resync with Michael
* bubulle@debian.org--2005/apt--main--0--patch-168
Vietnamese translation completed
* bubulle@debian.org--2005/apt--main--0--patch-169
Update PO files and POT file...again
* bubulle@debian.org--2005/apt--main--0--patch-170
Compelted French translation
* bubulle@debian.org--2005/apt--main--0--patch-171
Activate Welsh translation
* bubulle@debian.org--2005/apt--main--0--patch-172
Completed to 512 strings
* bubulle@debian.org--2005/apt--main--0--patch-173
Russian translation completed
* bubulle@debian.org--2005/apt--main--0--patch-174
Swedish translation completed
* bubulle@debian.org--2005/apt--main--0--patch-175
Merge from Philippe Batailler French manpages tree/Vietnamese translation update
* bubulle@debian.org--2005/apt--main--0--patch-176
Galician translation update
* bubulle@debian.org--2005/apt--main--0--patch-177
Slovak translation update
* bubulle@debian.org--2005/apt--main--0--patch-178
Polish translation update
* bubulle@debian.org--2005/apt--main--0--patch-179
Correct permissions
* bubulle@debian.org--2005/apt--main--0--patch-180
Japanese translation update
* bubulle@debian.org--2005/apt--main--0--patch-181
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-182
Catalan translation completed
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127
* merged with apt--mvo
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
* don't explod if a Provides has DepCompareOp
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
* fix regression about not working --print-uris in "install"
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
* create sources.list.d as well
* 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
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134
* only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135
tyop
* philippe.batailler@free.fr--2005/apt--main--0--patch-9
manpages
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 11 |
1 files changed, 1 insertions, 10 deletions
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) |