* cmdline/apt-get.cc:

  - honor APT::Get::Only-Source properly in FindSrc() (thanks to
    Martin Pitt for reporting the problem)

2 files changed, 10 insertions, 2 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 27e16d3f3..2693bd968 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1260,7 +1260,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)
       {
@@ -1278,7 +1279,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 2fb53972d..59a88ca21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.22) 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.21) UNRELEASED; urgency=low
 
   [ Osamu Aoki ]