fix "apt-get source pkg" if there is a binary package and

a source package of the same name but from different
packages (LP: #330103)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 06fa41017d7374bbdc62ba8954cbb2bc8fc0dd63..1c2c116891c04801275be6c85046d66894064f30 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1272,16 +1272,23 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
         }
       }   
    }
         }
       }   
    }

-   
-   // No source package name..
-   if (Src.empty() == true)
-      Src = TmpSrc;
-   
+

    // The best hit
    pkgSrcRecords::Parser *Last = 0;
    unsigned long Offset = 0;
    string Version;
    bool IsMatch = false;
    // The best hit
    pkgSrcRecords::Parser *Last = 0;
    unsigned long Offset = 0;
    string Version;
    bool IsMatch = false;

+   bool MatchSrcOnly = false;
+
+   // No source package name..
+   if (Src.empty() == true)
+      Src = TmpSrc;
+   else 
+      // if we have a source pkg name, make sure to only search
+      // for srcpkg names, otherwise apt gets confused if there
+      // is a binary package "pkg1" and a source package "pkg1"
+      // with the same name but that comes from different packages
+      MatchSrcOnly = true;

    
    // If we are matching by version then we need exact matches to be happy
    if (VerTag.empty() == false)
    
    // If we are matching by version then we need exact matches to be happy
    if (VerTag.empty() == false)


@@ -1291,13 +1298,13 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       binary packages in the search */
    pkgSrcRecords::Parser *Parse;
    SrcRecs.Restart();
       binary packages in the search */
    pkgSrcRecords::Parser *Parse;
    SrcRecs.Restart();

-   while ((Parse = SrcRecs.Find(Src.c_str(),false)) != 0)
+   while ((Parse = SrcRecs.Find(Src.c_str(), MarchSrcOnly)) != 0)

    {
       string Ver = Parse->Version();
       
       // show name mismatches
       if (IsMatch == true && Parse->Package() != Src) 
    {
       string Ver = Parse->Version();
       
       // show name mismatches
       if (IsMatch == true && Parse->Package() != Src) 

-        ioprintf(c1out,  _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str());
+        ioprintf(c1out,  _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str());

       
       if (VerTag.empty() == false)
       {
       
       if (VerTag.empty() == false)
       {

diff --git a/debian/changelog b/debian/changelog
index c0da66973a51e01850d734a345464a73bbbc51e2..19c06b5e90c5e0e9a3a4a5120f2a9830b2c53185 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,9 @@ apt (0.7.21) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - fix "apt-get source pkg=ver" if binary name != source name
       and show a message (LP: #202219)
   * cmdline/apt-get.cc:
     - fix "apt-get source pkg=ver" if binary name != source name
       and show a message (LP: #202219)

+    - fix "apt-get source pkg" if there is a binary package and
+      a source package of the same name but from different 
+      packages (LP: #330103)

   * apt-pkg/deb/debsystem.cc:
     - make strings i18n able 
   * apt-pkg/contrib/strutl.cc:
   * apt-pkg/deb/debsystem.cc:
     - make strings i18n able 
   * apt-pkg/contrib/strutl.cc: