merged from lp:~donkult/apt/sid

[apt.git] / apt-pkg / clean.cc

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 3fa67e8e69faaf6f8a47098c7ca0ecde3f24b2e1..9850b93b4bd460b5af5bc21a89b36c4ce3f20b7b 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -12,6 +12,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/aptconfiguration.h>

 
 #include <apti18n.h>    
 
 
 #include <apti18n.h>    
 


@@ -19,7 +20,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
                                                                        /*}}}*/
 #include <sys/stat.h>
 #include <unistd.h>
                                                                        /*}}}*/

-

 // ArchiveCleaner::Go - Perform smart cleanup of the archive           /*{{{*/
 // ---------------------------------------------------------------------
 /* Scan the directory for files to erase, we check the version information
 // ArchiveCleaner::Go - Perform smart cleanup of the archive           /*{{{*/
 // ---------------------------------------------------------------------
 /* Scan the directory for files to erase, we check the version information


@@ -27,7 +27,6 @@
 bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
 bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);

-   string MyArch = _config->Find("APT::Architecture");

       
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       
    DIR *D = opendir(Dir.c_str());
    if (D == 0)


@@ -76,9 +75,9 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       for (I = Start; *I != 0 && *I != '.' ;I++);
       if (*I != '.')
         continue;
       for (I = Start; *I != 0 && *I != '.' ;I++);
       if (*I != '.')
         continue;

-      string Arch = DeQuoteString(string(Start,I-Start));
+      string const Arch = DeQuoteString(string(Start,I-Start));

       
       

-      if (Arch != "all" && Arch != MyArch)
+      if (APT::Configuration::checkArchitecture(Arch) == false)

         continue;
       
       // Lookup the package
         continue;
       
       // Lookup the package


@@ -86,12 +85,12 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       if (P.end() != true)
       {
         pkgCache::VerIterator V = P.VersionList();
       if (P.end() != true)
       {
         pkgCache::VerIterator V = P.VersionList();

-        for (; V.end() == false; V++)
+        for (; V.end() == false; ++V)

         {
            // See if we can fetch this version at all
            bool IsFetchable = false;
            for (pkgCache::VerFileIterator J = V.FileList(); 
         {
            // See if we can fetch this version at all
            bool IsFetchable = false;
            for (pkgCache::VerFileIterator J = V.FileList(); 

-                J.end() == false; J++)
+                J.end() == false; ++J)

            {
               if (CleanInstalled == true &&
                   (J.File()->Flags & pkgCache::Flag::NotSource) != 0)
            {
               if (CleanInstalled == true &&
                   (J.File()->Flags & pkgCache::Flag::NotSource) != 0)