* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index b859e382b0c8a10314efee81ef0a687441a4c6ef..0d623d86217f6fb062a545c52dbfeb63cff94c41 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: clean.cc,v 1.2 1999/06/24 04:06:30 jgg Exp $
+// $Id: clean.cc,v 1.4 2001/02/20 07:03:17 jgg Exp $
 /* ######################################################################
 
    Clean - Clean out downloaded directories
@@ -15,6 +15,9 @@
 #include <apt-pkg/clean.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+
+#include <apti18n.h>    
 
 #include <dirent.h>
 #include <sys/stat.h>
@@ -27,15 +30,18 @@
    against our database to see if it is interesting */
 bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
 {
-   DIR *D = opendir(Dir.c_str());   
+   bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
+   string MyArch = _config->Find("APT::Architecture");
+      
+   DIR *D = opendir(Dir.c_str());
    if (D == 0)
-      return _error->Errno("opendir","Unable to read %s",Dir.c_str());
-   
+      return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+
    string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
-      return _error->Errno("chdir","Unable to change to ",Dir.c_str());
+      return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str());
    }
    
    for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
@@ -49,8 +55,12 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
 
       struct stat St;
       if (stat(Dir->d_name,&St) != 0)
-        return _error->Errno("stat","Unable to stat %s.",Dir->d_name);
-
+      {
+        chdir(StartDir.c_str());
+        closedir(D);
+        return _error->Errno("stat",_("Unable to stat %s."),Dir->d_name);
+      }
+      
       // Grab the package name
       const char *I = Dir->d_name;
       for (; *I != 0 && *I != '_';I++);
@@ -71,7 +81,10 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       if (*I != '.')
         continue;
       string Arch = DeQuoteString(string(Start,I-Start));
-            
+      
+      if (Arch != "all" && Arch != MyArch)
+        continue;
+      
       // Lookup the package
       pkgCache::PkgIterator P = Cache.FindPkg(Pkg);
       if (P.end() != true)
@@ -84,7 +97,8 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
            for (pkgCache::VerFileIterator J = V.FileList(); 
                 J.end() == false; J++)
            {
-              if ((J.File()->Flags & pkgCache::Flag::NotSource) != 0)
+              if (CleanInstalled == true &&
+                  (J.File()->Flags & pkgCache::Flag::NotSource) != 0)
                  continue;
               IsFetchable = true;
               break;