* apt-pkg/deb/dpkgpm.cc:

  - make sure that for multiarch packages, we are passing the full
    qualified package name to dpkg for removals. (Closes: #614298)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 7d0d34a460cd1e27dfd9c748e04558fca5cd8278..84443447f3ea3b0f5082e53ca94178778e35becf 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -881,7 +881,10 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
       // Generate the argument list
       const char *Args[MaxArgs + 50];
 
       // Generate the argument list
       const char *Args[MaxArgs + 50];

-      
+      // keep track of allocated strings for multiarch package names
+      char *Packages[MaxArgs + 50];
+      unsigned int pkgcount = 0;
+

       // Now check if we are within the MaxArgs limit
       //
       // this code below is problematic, because it may happen that
       // Now check if we are within the MaxArgs limit
       //
       // this code below is problematic, because it may happen that


@@ -989,13 +992,22 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       }      
       else
       {
       }      
       else
       {

+        string const nativeArch = _config->Find("APT::Architecture");

         for (;I != J && Size < MaxArgBytes; I++)
         {
            if((*I).Pkg.end() == true)
               continue;
            if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
               continue;
         for (;I != J && Size < MaxArgBytes; I++)
         {
            if((*I).Pkg.end() == true)
               continue;
            if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
               continue;

-           Args[n++] = I->Pkg.Name();
+           if (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all"))
+              Args[n++] = I->Pkg.Name();
+           else
+           {
+              string const PkgDesc = I->Pkg.Name() + string(":") + string(I->Pkg.Arch());
+              Packages[pkgcount] = new char[PkgDesc.size()+1];
+              strncpy(Packages[pkgcount++],PkgDesc.c_str(),PkgDesc.size()+1);
+              Args[n++] = Packages[pkgcount-1];
+           }

            Size += strlen(Args[n-1]);
         }       
       }      
            Size += strlen(Args[n-1]);
         }       
       }      


@@ -1145,6 +1157,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       sigemptyset(&sigmask);
       sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
 
       sigemptyset(&sigmask);
       sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
 

+      /* clean up the temporary allocation for multiarch package names in
+         the parent, so we don't leak memory when we return. */
+      for (unsigned int i = 0; i < pkgcount; i++)
+        delete [] Packages[i];
+

       // the result of the waitpid call
       int res;
       int select_ret;
       // the result of the waitpid call
       int res;
       int select_ret;

diff --git a/debian/changelog b/debian/changelog
index 971e967a4c92c7f3a3a11c3b58cf597932f33170..bcafbd71bcb3defe8907ed774a8a9e7029f6ded4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,12 @@ apt (0.8.11.6) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - reinstall dependencies of reinstalled "garbage" (Closes: #617257)
 
   * cmdline/apt-get.cc:
     - reinstall dependencies of reinstalled "garbage" (Closes: #617257)
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 07 Mar 2011 22:43:15 +0100
+  [ Steve Langasek ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - make sure that for multiarch packages, we are passing the full
+      qualified package name to dpkg for removals. (Closes: #614298)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 07 Mar 2011 22:46:24 +0100

 
 apt (0.8.11.5) unstable; urgency=low
 
 
 apt (0.8.11.5) unstable; urgency=low