* cmdline/apt-get.cc:

  - fix apt-get source pkg=version regression (closes: #561971)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index f84c82d283d1de099c0b27d8fa8bed9f8a3b571f..dede0137e6def3bed90e557293abc74bd6b929cb 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1299,31 +1299,41 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
               {
                  pkgRecords::Parser &Parse = Recs.Lookup(VF);
                  Src = Parse.SourcePkg();
+                 // no SourcePkg name, so it is the "binary" name
+                 if (Src.empty() == true)
+                    Src = TmpSrc;
+                 // no Version, so we try the Version of the SourcePkg -
+                 // and after that the version of the binary package
                  if (VerTag.empty() == true)
                     VerTag = Parse.SourceVer();
+                 if (VerTag.empty() == true)
+                    VerTag = Ver.VerStr();
                  break;
               }
            }
+           if (Src.empty() == false)
+              break;
         }
         if (Src.empty() == true) 
         {
-           if (VerTag.empty() == false)
-              _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-           else
+           // Sources files have no codename information
+           if (VerTag.empty() == true && DefRel.empty() == false)
               _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
-           VerTag.clear();
            DefRel.clear();
         }
       }
-      if (VerTag.empty() == true && DefRel.empty() == true) 
+      if (Src.empty() == true)
       {
-        // if we don't have a version or default release, use the CandidateVer to find the Source
+        // if we don't have found a fitting package yet so we will
+        // choose a good candidate and proceed with that.
+        // Maybe we will find a source later on with the right VerTag
         pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
         if (Ver.end() == false) 
         {
            pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
            Src = Parse.SourcePkg();
-           VerTag = Parse.SourceVer();
+           if (VerTag.empty() == true)
+              VerTag = Parse.SourceVer();
         }
       }
    }

diff --git a/debian/changelog b/debian/changelog
index eb50b4c78ea76edeefac897ba4d95f4d78c3ed79..03a467cfa4bd7512ce1013821a1f85d696589a14 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low
   * merged lp:~mvo/apt/history
     - this writes a /var/log/apt/history tagfile that contains details
       from the transaction (complements term.log)
+  * cmdline/apt-get.cc:
+    - fix apt-get source pkg=version regression (closes: #561971)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100