diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-08 10:19:02 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-08 10:19:02 +0000 |
| commit | a546101c245d4096961e0917c9aa9ab937b6e0ae (patch) | |
| tree | 0cdb6f752eda00e9e3dd9f724b0165cde16d22e9 | |
| parent | b63380b007b6394935a1412791243fdf939b3c92 (diff) | |
* fix regression about not working --print-uris in "install"
| -rw-r--r-- | cmdline/apt-get.cc | 9 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 4 insertions, 10 deletions
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) diff --git a/debian/changelog b/debian/changelog index b71fe095a..4f2ea848a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,11 @@ apt (0.6.43.3) unstable; urgency=low * 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) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Jan 2006 01:05:52 +0100 + -- apt (0.6.43.2) unstable; urgency=low |