#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/tagfile.h>
+
+#include <iostream>
#include <sstream>
#include <apti18n.h>
/*}}}*/
// Find the proper cache slot
StateCache &State = PkgState[I->ID];
State.iFlags = 0;
- State.DirtyState = pkgCache::State::RemoveUnknown;
- //State.AutomaticRemove = I->AutomaticRemove;
- State.AutomaticRemove = pkgCache::State::RemoveUnknown;
// Figure out the install version
State.CandidateVer = GetCandidateVer(I);
}
Update(Prog);
+
+ if(Prog != 0)
+ Prog->Done();
return true;
}
if(FileExists(state)) {
state_file.Open(state, FileFd::ReadOnly);
int file_size = state_file.Size();
- Prog->OverallProgress(0, file_size, 1,
- _("Reading extended state information"));
+ if(Prog != NULL)
+ Prog->OverallProgress(0, file_size, 1,
+ _("Reading state information"));
pkgTagFile tagfile(&state_file);
pkgTagSection section;
// Silently ignore unknown packages and packages with no actual
// version.
if(!pkg.end() && !pkg.VersionList().end()) {
- short reason = section.FindI("Remove-Reason",
- pkgCache::State::RemoveManual);
- PkgState[pkg->ID].AutomaticRemove = reason;
- //std::cout << "Set: " << pkgname << " to " << reason << std::endl;
+ short reason = section.FindI("Auto-Installed", 0);
+ if(reason > 0)
+ PkgState[pkg->ID].Flags |= Flag::Auto;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ std::cout << "Auto-Installed : " << pkgname << std::endl;
amt+=section.size();
- Prog->OverallProgress(amt, file_size, 1,
- _("Reading extended state information"));
+ if(Prog != NULL)
+ Prog->OverallProgress(amt, file_size, 1,
+ _("Reading state information"));
}
- Prog->OverallProgress(file_size, file_size, 1,
- _("Reading extended state information"));
+ if(Prog != NULL)
+ Prog->OverallProgress(file_size, file_size, 1,
+ _("Reading state information"));
}
}
bool pkgDepCache::writeStateFile(OpProgress *prog)
{
- // write the auto-mark list ----------------------------------
-
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());
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].AutomaticRemove = pkgCache::State::RemoveUnknown;
-
- // check if we have new information
- if(PkgState[pkg->ID].Flags & pkgCache::Flag::Auto) {
- std::cout << "pkg: " << pkg.Name() << " is auto-dep" << std::endl;
- PkgState[pkg->ID].AutomaticRemove = pkgCache::State::RemoveRequired;
- }
-
- if(PkgState[pkg->ID].AutomaticRemove != pkgCache::State::RemoveUnknown) {
+ 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()
- << "\nRemove-Reason: "
- << (int)(PkgState[pkg->ID].AutomaticRemove) << "\n\n";
+ ostr << "Package: " << pkg.Name()
+ << "\nAuto-Installed: 1\n\n";
StateFile.Write(ostr.str().c_str(), ostr.str().size());
- //std::cout << "Writing auto-mark: " << ostr.str() << endl;
}
}
return true;
AddSizes(Pkg);
}
/*}}}*/
-// DepCache::SetDirty - Switch the package between dirty states /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void pkgDepCache::SetDirty(PkgIterator const &Pkg, pkgCache::State::PkgRemoveState To)
-{
- StateCache &P = PkgState[Pkg->ID];
- P.DirtyState = To;
-}
- /*}}}*/
// DepCache::SetCandidateVersion - Change the candidate version /*{{{*/
// ---------------------------------------------------------------------
/* */