support long keyid and fingerprint in gpgv's GOODSIG

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

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 0ee3b765d4ebf49c292b41c8f8b568e41b82c238..fe57c26a2287da6015394321a857242b753e27c6 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -34,7 +34,15 @@
 bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
 bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);

-      
+
+   if(Dir == "/")
+      return _error->Error(_("Clean of %s is not supported"), Dir.c_str());
+
+   // non-existing directories are always clean
+   // we do not check for a directory explicitly to support symlinks
+   if (FileExists(Dir) == false)
+      return true;
+

    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());


@@ -51,6 +59,7 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||

+         strcmp(Dir->d_name,"lost+found") == 0 ||

          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;
          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;


@@ -103,7 +112,7 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
                 J.end() == false; ++J)
            {
               if (CleanInstalled == true &&
                 J.end() == false; ++J)
            {
               if (CleanInstalled == true &&

-                  (J.File()->Flags & pkgCache::Flag::NotSource) != 0)
+                  J.File().Flagged(pkgCache::Flag::NotSource))

                  continue;
               IsFetchable = true;
               break;
                  continue;
               IsFetchable = true;
               break;


@@ -128,3 +137,6 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+
+pkgArchiveCleaner::pkgArchiveCleaner() : d(NULL) {}
+APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}