* slighly more debug output, renamed "--automatic-remove" to "--auto-remove"

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

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 366687382121aad69d04f4de9e20da089d4db955..9adc4e3901f9cecab2f1cf42e770e71ff35e40fc 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -125,12 +125,11 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
         // Silently ignore unknown packages and packages with no actual
         // version.
         if(!pkg.end() && !pkg.VersionList().end()) {
         // Silently ignore unknown packages and packages with no actual
         // version.
         if(!pkg.end() && !pkg.VersionList().end()) {

-           short reason = section.FindI("Install-Reason", 0);
+           short reason = section.FindI("Auto-Installed", 0);

            if(reason > 0)
            if(reason > 0)

-              PkgState[pkg->ID].Flags  |= pkgCache::Flag::Auto;
+              PkgState[pkg->ID].Flags  |= Flag::Auto;

            if(_config->FindB("Debug::pkgAutoRemove",false))
            if(_config->FindB("Debug::pkgAutoRemove",false))

-              std::cout << "Install-Reason for: " << pkgname 
-                        << " is " << reason << std::endl;
+              std::cout << "Auto-Installed : " << pkgname << std::endl;

            amt+=section.size();
            if(Prog != NULL)
               Prog->OverallProgress(amt, file_size, 1, 
            amt+=section.size();
            if(Prog != NULL)
               Prog->OverallProgress(amt, file_size, 1, 


@@ -160,12 +159,12 @@ bool pkgDepCache::writeStateFile(OpProgress *prog)
    std::ostringstream ostr;
    for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) {
 
    std::ostringstream ostr;
    for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end();pkg++) {
 

-      if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) {
+      if(PkgState[pkg->ID].Flags & Flag::Auto) {

         if(_config->FindB("Debug::pkgAutoRemove",false))
            std::clog << "AutoInstal: " << pkg.Name() << std::endl;
         ostr.str(string(""));
         ostr << "Package: " << pkg.Name() 
         if(_config->FindB("Debug::pkgAutoRemove",false))
            std::clog << "AutoInstal: " << pkg.Name() << std::endl;
         ostr.str(string(""));
         ostr << "Package: " << pkg.Name() 

-             << "\nInstall-Reason: 1\n\n";
+             << "\nAuto-Installed: 1\n\n";

         StateFile.Write(ostr.str().c_str(), ostr.str().size());
       }
    }
         StateFile.Write(ostr.str().c_str(), ostr.str().size());
       }
    }