diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 18:45:46 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-07-30 18:45:46 +0200 |
| commit | 973439b6251ce363f44da5afe89cf73214cbfc70 (patch) | |
| tree | d30035c1ec38eb26bab07e472f3929c5f18105ef | |
| parent | d5752e18bed18c706c93f5c43c61016c72132ede (diff) | |
| parent | fa1d338f0c8770d574db4f3728ef4357765185f7 (diff) | |
* cmdline/apt-get.cc:
- honor APT::Get::Only-Source properly in FindSrc() (thanks to
Martin Pitt for reporting the problem)
* Added more error handlings. Closes: #438803, #462734, #454989
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2ca0855b6..ab6dca388 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1262,7 +1262,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look in the archive for a source package of the same name. */ - if (_config->FindB("APT::Get::Only-Source") == false) + bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); + if (MatchSrcOnly == false) { if (Pkg.end() == false) { @@ -1280,7 +1281,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, unsigned long Offset = 0; string Version; bool IsMatch = false; - bool MatchSrcOnly = false; // No source package name.. if (Src.empty() == true) diff --git a/debian/changelog b/debian/changelog index 3d5db5f48..cb5e74cb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.23) unstable; urgency=low + + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Jul 2009 15:27:30 +0200 + apt (0.7.22) unstable; urgency=low [ Christian Perrier ] @@ -113,7 +121,7 @@ apt (0.7.22) unstable; urgency=low [ Osamu Aoki ] * Updated cron script to support backups by hardlinks and verbose levels. All features turned off by default. - * Added more error handlings. Closes: #438803, #462734, #454989, + * Added more error handlings. Closes: #438803, #462734, #454989 * Documented all cron script related configuration items in configure-index. |