* 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 52b43d83d2d1d8dd8ed135d67aa1cce241767762..9adc4e3901f9cecab2f1cf42e770e71ff35e40fc 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -78,7 +78,6 @@ bool pkgDepCache::Init(OpProgress *Prog)
       // Find the proper cache slot
       StateCache &State = PkgState[I->ID];
       State.iFlags = 0;
       // Find the proper cache slot
       StateCache &State = PkgState[I->ID];
       State.iFlags = 0;

-      State.InstallReason = Manual;

 
       // Figure out the install version
       State.CandidateVer = GetCandidateVer(I);
 
       // Figure out the install version
       State.CandidateVer = GetCandidateVer(I);


@@ -113,8 +112,9 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)
    if(FileExists(state)) {
       state_file.Open(state, FileFd::ReadOnly);
       int file_size = state_file.Size();
    if(FileExists(state)) {
       state_file.Open(state, FileFd::ReadOnly);
       int file_size = state_file.Size();

-      Prog->OverallProgress(0, file_size, 1, 
-                           _("Reading state information"));
+      if(Prog != NULL)
+        Prog->OverallProgress(0, file_size, 1, 
+                              _("Reading state information"));

 
       pkgTagFile tagfile(&state_file);
       pkgTagSection section;
 
       pkgTagFile tagfile(&state_file);
       pkgTagSection section;


@@ -125,17 +125,19 @@ 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",pkgDepCache::Manual);
-           PkgState[pkg->ID].InstallReason = (ChangedReason)reason;
+           short reason = section.FindI("Auto-Installed", 0);
+           if(reason > 0)
+              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();
            amt+=section.size();

-           Prog->OverallProgress(amt, file_size, 1, 
-                                 _("Reading state information"));
+           if(Prog != NULL)
+              Prog->OverallProgress(amt, file_size, 1, 
+                                    _("Reading state information"));

         }
         }

-        Prog->OverallProgress(file_size, file_size, 1, 
-                              _("Reading state information"));
+        if(Prog != NULL)
+           Prog->OverallProgress(file_size, file_size, 1, 
+                                 _("Reading state information"));

       }
    }
 
       }
    }
 


@@ -147,6 +149,9 @@ bool pkgDepCache::writeStateFile(OpProgress *prog)
    FileFd StateFile;
    string state = _config->FindDir("Dir::State") + "pkgstates";
 
    FileFd StateFile;
    string state = _config->FindDir("Dir::State") + "pkgstates";
 

+   if(_config->FindB("Debug::pkgAutoRemove",false))
+      std::clog << "pkgDepCache::writeStateFile()" << std::endl;
+

    if(!StateFile.Open(state, FileFd::WriteEmpty))
       return _error->Error(_("Failed to write StateFile %s"),
                           state.c_str());
    if(!StateFile.Open(state, FileFd::WriteEmpty))
       return _error->Error(_("Failed to write StateFile %s"),
                           state.c_str());


@@ -154,22 +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++) {
 

-      // clear out no longer installed pkg
-      if(PkgState[pkg->ID].Delete() || pkg.CurrentVer() == NULL) 
-        PkgState[pkg->ID].InstallReason = Manual;
-
-      // check if we have new information
-      if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) {
-        if(_config->FindI("Debug::pkgAutoRemove",false))
-           std::clog << "pkg: " << pkg.Name() << " is auto-dep" << std::endl;
-        PkgState[pkg->ID].InstallReason = Libapt;
-      }
-
-      if(PkgState[pkg->ID].InstallReason != Manual) {
+      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() 
         ostr.str(string(""));
         ostr << "Package: " << pkg.Name() 

-             << "\nInstall-Reason: "
-             << (int)(PkgState[pkg->ID].InstallReason) << "\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());
       }
    }