fix logic for finding what package dpkg means in the --status-fd and only send out...

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b4d812d26f80baed5b10408382b1b2218bc9ee8c..61d8eec02962671b7188fdfb87e0f0e182aff941 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -557,11 +557,26 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
    std::string pkgname = list[1];
    if (pkgname.find(":") == std::string::npos)
    {
    std::string pkgname = list[1];
    if (pkgname.find(":") == std::string::npos)
    {

-      string const nativeArch = _config->Find("APT::Architecture");
-      pkgname = pkgname + ":" + nativeArch;
+      // find the package in the group that is in a touched by dpkg
+      // if there are multiple dpkg will send us a full pkgname:arch
+      pkgCache::GrpIterator Grp = Cache.FindGrp(pkgname);
+      if (Grp.end() == false) 
+      {
+          pkgCache::PkgIterator P = Grp.PackageList();
+          for (; P.end() != true; P = Grp.NextPkg(P))
+          {
+              if(Cache[P].Mode != pkgDepCache::ModeKeep)
+              {
+                  pkgname = P.FullName();
+                  break;
+              }
+          }
+      }

    }
    const char* const pkg = pkgname.c_str();
    const char* action = list[2].c_str();
    }
    const char* const pkg = pkgname.c_str();
    const char* action = list[2].c_str();

+   
+   std::string short_pkgname = StringSplit(pkgname, ":")[0];

 
    // 'processing' from dpkg looks like
    // 'processing: action: pkg'
 
    // 'processing' from dpkg looks like
    // 'processing: action: pkg'


@@ -640,7 +655,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
       PackageOpsDone[pkg]++;
       PackagesDone++;
       // build the status str
       PackageOpsDone[pkg]++;
       PackagesDone++;
       // build the status str

-      status << "pmstatus:" << pkg 
+      status << "pmstatus:" << short_pkgname

             << ":"  << (PackagesDone/float(PackagesTotal)*100.0) 
             << ":" << s
             << endl;
             << ":"  << (PackagesDone/float(PackagesTotal)*100.0) 
             << ":" << s
             << endl;


@@ -653,7 +668,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
         std::clog << "send: '" << status.str() << "'" << endl;
    }
    if (Debug == true) 
         std::clog << "send: '" << status.str() << "'" << endl;
    }
    if (Debug == true) 

-      std::clog << "(parsed from dpkg) pkg: " << pkg 
+      std::clog << "(parsed from dpkg) pkg: " << short_pkgname

                << " action: " << action << endl;
 }
                                                                        /*}}}*/
                << " action: " << action << endl;
 }
                                                                        /*}}}*/