X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0a8e3465cb644e380ab0fc6d66f6d1f17363b34e..fc9d4b7b18e1c3c9fbcdf6766d21180c0db88b24:/cmdline/apt-get.cc diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f3dd4205a..451519c7c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.1 1998/10/02 04:39:56 jgg Exp $ +// $Id: apt-get.cc,v 1.42 1999/02/15 08:23:10 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -32,10 +32,23 @@ #include #include #include +#include +#include +#include +#include +#include #include +#include "acqprogress.h" + #include +#include +#include +#include +#include +#include +#include /*}}}*/ ostream c0out; @@ -44,14 +57,35 @@ ostream c2out; ofstream devnull("/dev/null"); unsigned int ScreenWidth = 80; +// YnPrompt - Yes No Prompt. /*{{{*/ +// --------------------------------------------------------------------- +/* Returns true on a Yes.*/ +bool YnPrompt() +{ + if (_config->FindB("APT::Get::Assume-Yes",false) == true) + { + c1out << 'Y' << endl; + return true; + } + + char C = 0; + char Jnk = 0; + read(STDIN_FILENO,&C,1); + while (C != '\n' && Jnk != '\n') read(STDIN_FILENO,&Jnk,1); + + if (!(C == 'Y' || C == 'y' || C == '\n' || C == '\r')) + return false; + return true; +} + /*}}}*/ // ShowList - Show a list /*{{{*/ // --------------------------------------------------------------------- /* This prints out a string of space seperated words with a title and a two space indent line wraped to the current screen width. */ -void ShowList(ostream &out,string Title,string List) +bool ShowList(ostream &out,string Title,string List) { if (List.empty() == true) - return; + return true; // Acount for the leading space int ScreenWidth = ::ScreenWidth - 3; @@ -71,6 +105,7 @@ void ShowList(ostream &out,string Title,string List) out << " " << string(List,Start,End - Start) << endl; Start = End + 1; } + return false; } /*}}}*/ // ShowBroken - Debugging aide /*{{{*/ @@ -80,41 +115,72 @@ void ShowList(ostream &out,string Title,string List) description. */ void ShowBroken(ostream &out,pkgDepCache &Cache) { - out << "Sorry, but the following packages are broken - this means they have unmet" << endl; - out << "dependencies:" << endl; + out << "Sorry, but the following packages have unmet dependencies:" << endl; pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; I++) { - if (Cache[I].InstBroken() == true) + if (Cache[I].InstBroken() == false) + continue; + + // Print out each package and the failed dependencies + out <<" " << I.Name() << ":"; + int Indent = strlen(I.Name()) + 3; + bool First = true; + if (Cache[I].InstVerIter(Cache).end() == true) { - // Print out each package and the failed dependencies - out <<" " << I.Name() << ":"; - int Indent = strlen(I.Name()) + 3; - bool First = true; - for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; D++) + cout << endl; + continue; + } + + for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false;) + { + // Compute a single dependency element (glob or) + pkgCache::DepIterator Start; + pkgCache::DepIterator End; + D.GlobOr(Start,End); + + if (Cache.IsImportantDep(End) == false || + (Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall) + continue; + + if (First == false) + for (int J = 0; J != Indent; J++) + out << ' '; + First = false; + + cout << ' ' << End.DepType() << ": " << End.TargetPkg().Name(); + + // Show a quick summary of the version requirements + if (End.TargetVer() != 0) + out << " (" << End.CompType() << " " << End.TargetVer() << + ")"; + + /* Show a summary of the target package if possible. In the case + of virtual packages we show nothing */ + + pkgCache::PkgIterator Targ = End.TargetPkg(); + if (Targ->ProvidesList == 0) { - if (Cache.IsImportantDep(D) == false || (Cache[D] & - pkgDepCache::DepInstall) != 0) - continue; - - if (First == false) - for (int J = 0; J != Indent; J++) - out << ' '; - First = false; - - if (D->Type == pkgCache::Dep::Conflicts) - out << " Conflicts:" << D.TargetPkg().Name(); - else - out << " Depends:" << D.TargetPkg().Name(); - - // Show a quick summary of the version requirements - if (D.TargetVer() != 0) - out << " (" << D.CompType() << " " << D.TargetVer() << - ")" << endl; + out << " but "; + pkgCache::VerIterator Ver = Cache[Targ].InstVerIter(Cache); + if (Ver.end() == false) + out << Ver.VerStr() << " is installed"; else - out << endl; - } - } + { + if (Cache[Targ].CandidateVerIter(Cache).end() == true) + { + if (Targ->ProvidesList == 0) + out << "it is not installable"; + else + out << "it is a virtual package"; + } + else + out << "it is not installed"; + } + } + + out << endl; + } } } /*}}}*/ @@ -145,6 +211,7 @@ void ShowDel(ostream &out,pkgDepCache &Dep) for (;I.end() != true; I++) if (Dep[I].Delete() == true) List += string(I.Name()) + " "; + ShowList(out,"The following packages will be REMOVED:",List); } /*}}}*/ @@ -188,7 +255,7 @@ void ShowUpgraded(ostream &out,pkgDepCache &Dep) // ShowHold - Show held but changed packages /*{{{*/ // --------------------------------------------------------------------- /* */ -void ShowHold(ostream &out,pkgDepCache &Dep) +bool ShowHold(ostream &out,pkgDepCache &Dep) { pkgCache::PkgIterator I = Dep.PkgBegin(); string List; @@ -199,7 +266,7 @@ void ShowHold(ostream &out,pkgDepCache &Dep) List += string(I.Name()) + " "; } - ShowList(out,"The following held packages will be changed:",List); + return ShowList(out,"The following held packages will be changed:",List); } /*}}}*/ // ShowEssential - Show an essential package warning /*{{{*/ @@ -207,12 +274,12 @@ void ShowHold(ostream &out,pkgDepCache &Dep) /* This prints out a warning message that is not to be ignored. It shows all essential packages and their dependents that are to be removed. It is insanely risky to remove the dependents of an essential package! */ -void ShowEssential(ostream &out,pkgDepCache &Dep) +bool ShowEssential(ostream &out,pkgDepCache &Dep) { pkgCache::PkgIterator I = Dep.PkgBegin(); string List; bool *Added = new bool[Dep.HeaderP->PackageCount]; - for (int I = 0; I != Dep.HeaderP->PackageCount; I++) + for (unsigned int I = 0; I != Dep.HeaderP->PackageCount; I++) Added[I] = false; for (;I.end() != true; I++) @@ -236,22 +303,29 @@ void ShowEssential(ostream &out,pkgDepCache &Dep) // Print out any essential package depenendents that are to be removed for (pkgDepCache::DepIterator D = I.CurrentVer().DependsList(); D.end() == false; D++) { + // Skip everything but depends + if (D->Type != pkgCache::Dep::PreDepends && + D->Type != pkgCache::Dep::Depends) + continue; + pkgCache::PkgIterator P = D.SmartTargetPkg(); if (Dep[P].Delete() == true) { if (Added[P->ID] == true) continue; Added[P->ID] = true; - List += string(P.Name()) + " "; + + char S[300]; + sprintf(S,"%s (due to %s) ",P.Name(),I.Name()); + List += S; } } } + delete [] Added; if (List.empty() == false) out << "WARNING: The following essential packages will be removed" << endl; - ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List); - - delete [] Added; + return ShowList(out,"This should NOT be done unless you know exactly what you are doing!",List); } /*}}}*/ // Stats - Show some statistics /*{{{*/ @@ -290,12 +364,13 @@ class CacheFile FileFd *File; MMap *Map; pkgDepCache *Cache; + pkgDpkgLock Lock; inline operator pkgDepCache &() {return *Cache;}; inline pkgDepCache *operator ->() {return Cache;}; inline pkgDepCache &operator *() {return *Cache;}; - bool Open(); + bool Open(bool AllowBroken = false); CacheFile() : File(0), Map(0), Cache(0) {}; ~CacheFile() { @@ -309,8 +384,11 @@ class CacheFile // --------------------------------------------------------------------- /* This routine generates the caches and then opens the dependency cache and verifies that the system is OK. */ -bool CacheFile::Open() +bool CacheFile::Open(bool AllowBroken) { + if (_error->PendingError() == true) + return false; + // Create a progress class OpTextProgress Progress(*_config); @@ -323,11 +401,13 @@ bool CacheFile::Open() pkgMakeStatusCache(List,Progress); if (_error->PendingError() == true) return _error->Error("The package lists or status file could not be parsed or opened."); + if (_error->empty() == false) + _error->Warning("You may want to run apt-get update to correct theses missing files"); Progress.Done(); // Open the cache file - File = new FileFd(_config->FindDir("Dir::Cache::pkgcache"),FileFd::ReadOnly); + File = new FileFd(_config->FindFile("Dir::Cache::pkgcache"),FileFd::ReadOnly); if (_error->PendingError() == true) return false; @@ -350,7 +430,7 @@ bool CacheFile::Open() return false; // Nothing is broken - if (Cache->BrokenCount() == 0) + if (Cache->BrokenCount() == 0 || AllowBroken == true) return true; // Attempt to fix broken things @@ -364,6 +444,8 @@ bool CacheFile::Open() return _error->Error("Unable to correct dependencies"); } + if (pkgMinimizeUpgrade(*Cache) == false) + return _error->Error("Unable to minimize the upgrade set"); c1out << " Done" << endl; } @@ -383,38 +465,218 @@ bool CacheFile::Open() // --------------------------------------------------------------------- /* This displays the informative messages describing what is going to happen and then calls the download routines */ -bool InstallPackages(pkgDepCache &Cache,bool ShwKept) +bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true) { + bool Fail = false; + + // Show all the various warning indicators ShowDel(c1out,Cache); ShowNew(c1out,Cache); if (ShwKept == true) ShowKept(c1out,Cache); - ShowHold(c1out,Cache); + Fail |= !ShowHold(c1out,Cache); if (_config->FindB("APT::Get::Show-Upgraded",false) == true) ShowUpgraded(c1out,Cache); - ShowEssential(c1out,Cache); + Fail |= !ShowEssential(c1out,Cache); Stats(c1out,Cache); // Sanity check - if (Cache.BrokenCount() != 0) + if (Cache->BrokenCount() != 0) { ShowBroken(c1out,Cache); return _error->Error("Internal Error, InstallPackages was called with broken packages!"); } - if (Cache.DelCount() == 0 && Cache.InstCount() == 0 && - Cache.BadCount() == 0) - return true; + if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + return true; + + // Run the simulator .. + if (_config->FindB("APT::Get::Simulate") == true) + { + pkgSimulate PM(Cache); + return PM.DoInstall(); + } + + // Create the text record parser + pkgRecords Recs(Cache); + if (_error->PendingError() == true) + return false; + + // Lock the archive directory + if (_config->FindB("Debug::NoLocking",false) == false) + { + FileFd Lock(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); + if (_error->PendingError() == true) + return _error->Error("Unable to lock the download directory"); + } + + // Create the download object + AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); + pkgAcquire Fetcher(&Stat); + + // Read the source list + pkgSourceList List; + if (List.ReadMainList() == false) + return _error->Error("The list of sources could not be read."); + + // Create the package manager and prepare to download + pkgDPkgPM PM(Cache); + if (PM.GetArchives(&Fetcher,&List,&Recs) == false || + _error->PendingError() == true) + return false; + + // Display statistics + unsigned long FetchBytes = Fetcher.FetchNeeded(); + unsigned long DebBytes = Fetcher.TotalNeeded(); + if (DebBytes != Cache->DebSize()) + { + c0out << DebBytes << ',' << Cache->DebSize() << endl; + c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl; + } - return true; + // Number of bytes + c1out << "Need to get "; + if (DebBytes != FetchBytes) + c1out << SizeToStr(FetchBytes) << "b/" << SizeToStr(DebBytes) << 'b'; + else + c1out << SizeToStr(DebBytes) << 'b'; + + c1out << " of archives. After unpacking "; + + // Size delta + if (Cache->UsrSize() >= 0) + c1out << SizeToStr(Cache->UsrSize()) << "b will be used." << endl; + else + c1out << SizeToStr(-1*Cache->UsrSize()) << "b will be freed." << endl; + + if (_error->PendingError() == true) + return false; + + // Fail safe check + if (_config->FindB("APT::Get::Assume-Yes",false) == true) + { + if (Fail == true && _config->FindB("APT::Get::Force-Yes",false) == false) + return _error->Error("There are problems and -y was used without --force-yes"); + } + + // Prompt to continue + if (Ask == true) + { + if (_config->FindI("quiet",0) < 2 || + _config->FindB("APT::Get::Assume-Yes",false) == false) + c2out << "Do you want to continue? [Y/n] " << flush; + + if (YnPrompt() == false) + exit(1); + } + + if (_config->FindB("APT::Get::Print-URIs") == true) + { + pkgAcquire::UriIterator I = Fetcher.UriBegin(); + for (; I != Fetcher.UriEnd(); I++) + cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << + I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl; + return true; + } + + // Run it + if (Fetcher.Run() == false) + return false; + + // Print out errors + bool Failed = false; + bool Transient = false; + for (pkgAcquire::Item **I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) + { + if ((*I)->Status == pkgAcquire::Item::StatDone && + (*I)->Complete == true) + continue; + + if ((*I)->Status == pkgAcquire::Item::StatIdle) + { + Transient = true; + Failed = true; + continue; + } + + cerr << "Failed to fetch " << (*I)->Describe() << endl; + cerr << " " << (*I)->ErrorText << endl; + Failed = true; + } + + if (_config->FindB("APT::Get::Download-Only",false) == true) + return true; + + if (Failed == true && _config->FindB("APT::Get::Fix-Missing",false) == false) + { + if (Transient == true) + { + c2out << "Upgrading with disk swapping is not supported in this version." << endl; + c2out << "Try running multiple times with --fix-missing" << endl; + } + + return _error->Error("Unable to fetch some archives, maybe try with --fix-missing?"); + } + + // Try to deal with missing package files + if (PM.FixMissing() == false) + { + cerr << "Unable to correct missing packages." << endl; + return _error->Error("Aborting Install."); + } + + Cache.Lock.Close(); + return PM.DoInstall(); } /*}}}*/ // DoUpdate - Update the package lists /*{{{*/ // --------------------------------------------------------------------- /* */ -bool DoUpdate(CommandLine &CmdL) +bool DoUpdate(CommandLine &) { + // Get the source list + pkgSourceList List; + if (List.ReadMainList() == false) + return false; + + // Lock the list directory + if (_config->FindB("Debug::NoLocking",false) == false) + { + FileFd Lock(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); + if (_error->PendingError() == true) + return _error->Error("Unable to lock the list directory"); + } + + // Create the download object + AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); + pkgAcquire Fetcher(&Stat); + + // Populate it with the source selection + pkgSourceList::const_iterator I; + for (I = List.begin(); I != List.end(); I++) + { + new pkgAcqIndex(&Fetcher,I); + if (_error->PendingError() == true) + return false; + } + + // Run it + if (Fetcher.Run() == false) + return false; + + // Clean out any old list files + if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || + Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) + return false; + + // Prepare the cache. + CacheFile Cache; + if (Cache.Open() == false) + return false; + + return true; } /*}}}*/ // DoUpgrade - Upgrade all packages /*{{{*/ @@ -428,7 +690,6 @@ bool DoUpgrade(CommandLine &CmdL) return false; // Do the upgrade - pkgProblemResolver Resolve(Cache); if (pkgAllUpgrade(Cache) == false) { ShowBroken(c1out,Cache); @@ -444,12 +705,22 @@ bool DoUpgrade(CommandLine &CmdL) bool DoInstall(CommandLine &CmdL) { CacheFile Cache; - if (Cache.Open() == false) + if (Cache.Open(CmdL.FileSize() != 1) == false) return false; - int ExpectedInst = 0; + // Enter the special broken fixing mode if the user specified arguments + bool BrokenFix = false; + if (Cache->BrokenCount() != 0) + BrokenFix = true; + + unsigned int ExpectedInst = 0; + unsigned int Packages = 0; pkgProblemResolver Fix(Cache); + bool DefRemove = false; + if (strcasecmp(CmdL.FileList[0],"remove") == 0) + DefRemove = true; + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { // Duplicate the string @@ -460,26 +731,84 @@ bool DoInstall(CommandLine &CmdL) strcpy(S,*I); // See if we are removing the package - bool Remove = false; - if (S[Length - 1] == '-') + bool Remove = DefRemove; + if (Cache->FindPkg(S).end() == true) { - Remove = true; - S[--Length] = 0; + // Handle an optional end tag indicating what to do + if (S[Length - 1] == '-') + { + Remove = true; + S[--Length] = 0; + } + if (S[Length - 1] == '+') + { + Remove = false; + S[--Length] = 0; + } } // Locate the package pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + Packages++; if (Pkg.end() == true) return _error->Error("Couldn't find package %s",S); + // Handle the no-upgrade case + if (_config->FindB("APT::Get::no-upgrade",false) == true && + Pkg->CurrentVer != 0) + { + c1out << "Skipping " << Pkg.Name() << ", it is already installed and no-upgrade is set." << endl; + continue; + } + // Check if there is something new to install pkgDepCache::StateCache &State = (*Cache)[Pkg]; if (State.CandidateVer == 0) + { + if (Pkg->ProvidesList != 0) + { + c1out << "Package " << S << " is a virtual package provided by:" << endl; + + pkgCache::PrvIterator I = Pkg.ProvidesList(); + for (; I.end() == false; I++) + { + pkgCache::PkgIterator Pkg = I.OwnerPkg(); + + if ((*Cache)[Pkg].CandidateVerIter(*Cache) == I.OwnerVer()) + { + if ((*Cache)[Pkg].Install() == true && (*Cache)[Pkg].NewInstall() == false) + c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << + " [Installed]"<< endl; + else + c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl; + } + } + c1out << "You should explicly select one to install." << endl; + } + else + { + c1out << "Package " << S << " has no available version, but exists in the database." << endl; + c1out << "This typically means that the package was mentioned in a dependency and " << endl; + c1out << "never uploaded, or that it is an obsolete package." << endl; + + string List; + pkgCache::DepIterator Dep = Pkg.RevDependsList(); + for (; Dep.end() == false; Dep++) + { + if (Dep->Type != pkgCache::Dep::Replaces) + continue; + List += string(Dep.ParentPkg().Name()) + " "; + } + ShowList(c1out,"However the following packages replace it:",List); + } + return _error->Error("Package %s has no installation candidate",S); + } Fix.Protect(Pkg); if (Remove == true) { + Fix.Remove(Pkg); Cache->MarkDelete(Pkg); continue; } @@ -492,17 +821,43 @@ bool DoInstall(CommandLine &CmdL) ExpectedInst++; // Install it with autoinstalling enabled. - if (State.InstBroken() == true) + if (State.InstBroken() == true && BrokenFix == false) Cache->MarkInstall(Pkg,true); } + /* If we are in the Broken fixing mode we do not attempt to fix the + problems. This is if the user invoked install without -f and gave + packages */ + if (BrokenFix == true && Cache->BrokenCount() != 0) + { + c1out << "You might want to run `apt-get -f install' to correct these." << endl; + ShowBroken(c1out,Cache); + + return _error->Error("Unmet dependencies. Try using -f."); + } + // Call the scored problem resolver + Fix.InstallProtect(); if (Fix.Resolve(true) == false) _error->Discard(); // Now we check the state of the packages, if (Cache->BrokenCount() != 0) { + c1out << "Some packages could not be installed. This may mean that you have" << endl; + c1out << "requested an impossible situation or if you are using the unstable" << endl; + c1out << "distribution that some required packages have not yet been created" << endl; + c1out << "or been moved out of Incoming." << endl; + if (Packages == 1) + { + c1out << endl; + c1out << "Since you only requested a single operation it is extremely likely that" << endl; + c1out << "the package is simply not installable and a bug report against" << endl; + c1out << "that package should be filed." << endl; + } + + c1out << "The following information may help to resolve the situation:" << endl; + c1out << endl; ShowBroken(c1out,Cache); return _error->Error("Sorry, broken packages"); } @@ -530,7 +885,11 @@ bool DoInstall(CommandLine &CmdL) ShowList(c1out,"The following extra packages will be installed:",List); } - return InstallPackages(Cache,false); + // See if we need to prompt + if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) + return InstallPackages(Cache,false,false); + + return InstallPackages(Cache,false); } /*}}}*/ // DoDistUpgrade - Automatic smart upgrader /*{{{*/ @@ -581,7 +940,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) /* Install the package only if it is a new install, the autoupgrader will deal with the rest */ if (I->SelectedState == pkgCache::State::Install) - Cache->MarkInstall(I); + Cache->MarkInstall(I,true); } // Apply erasures now, they override everything else. @@ -593,12 +952,37 @@ bool DoDSelectUpgrade(CommandLine &CmdL) Cache->MarkDelete(I); } - /* Use updates smart upgrade to do the rest, it will automatically - ignore held items */ + /* Resolve any problems that dselect created, allupgrade cannot handle + such things. We do so quite agressively too.. */ + if (Cache->BrokenCount() != 0) + { + pkgProblemResolver Fix(Cache); + + // Hold back held packages. + if (_config->FindB("APT::Ingore-Hold",false) == false) + { + for (pkgCache::PkgIterator I = Cache->PkgBegin(); I.end() == false; I++) + { + if (I->SelectedState == pkgCache::State::Hold) + { + Fix.Protect(I); + Cache->MarkKeep(I); + } + } + } + + if (Fix.Resolve() == false) + { + ShowBroken(c1out,Cache); + return _error->Error("Internal Error, problem resolver broke stuff"); + } + } + + // Now upgrade everything if (pkgAllUpgrade(Cache) == false) { ShowBroken(c1out,Cache); - return _error->Error("Internal Error, AllUpgrade broke stuff"); + return _error->Error("Internal Error, problem resolver broke stuff"); } return InstallPackages(Cache,false); @@ -609,9 +993,37 @@ bool DoDSelectUpgrade(CommandLine &CmdL) /* */ bool DoClean(CommandLine &CmdL) { + pkgAcquire Fetcher; + Fetcher.Clean(_config->FindDir("Dir::Cache::archives")); + Fetcher.Clean(_config->FindDir("Dir::Cache::archives") + "partial/"); return true; } /*}}}*/ +// DoAutoClean - Smartly remove downloaded archives /*{{{*/ +// --------------------------------------------------------------------- +/* This is similar to clean but it only purges things that cannot be + downloaded, that is old versions of cached packages. */ +class LogCleaner : public pkgArchiveCleaner +{ + protected: + virtual void Erase(const char *File,string Pkg,string Ver,struct stat &St) + { + cout << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "b]" << endl; + }; +}; + +bool DoAutoClean(CommandLine &CmdL) +{ + CacheFile Cache; + if (Cache.Open(true) == false) + return false; + + LogCleaner Cleaner; + + return Cleaner.Go(_config->FindDir("Dir::Cache::archives"),*Cache) && + Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache); +} + /*}}}*/ // DoCheck - Perform the check operation /*{{{*/ // --------------------------------------------------------------------- /* Opening automatically checks the system, this command is mostly used @@ -628,11 +1040,13 @@ bool DoCheck(CommandLine &CmdL) // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ -int ShowHelp() +bool ShowHelp(CommandLine &CmdL) { cout << PACKAGE << ' ' << VERSION << " for " << ARCHITECTURE << " compiled on " << __DATE__ << " " << __TIME__ << endl; - + if (_config->FindB("version") == true) + return 100; + cout << "Usage: apt-get [options] command" << endl; cout << " apt-get [options] install pkg1 [pkg2 ...]" << endl; cout << endl; @@ -644,14 +1058,16 @@ int ShowHelp() cout << " update - Retrieve new lists of packages" << endl; cout << " upgrade - Perform an upgrade" << endl; cout << " install - Install new packages (pkg is libc6 not libc6.deb)" << endl; + cout << " remove - Remove packages" << endl; cout << " dist-upgrade - Distribution upgrade, see apt-get(8)" << endl; cout << " dselect-upgrade - Follow dselect selections" << endl; cout << " clean - Erase downloaded archive files" << endl; + cout << " autoclean - Erase old downloaded archive files" << endl; cout << " check - Verify that there are no broken dependencies" << endl; cout << endl; cout << "Options:" << endl; - cout << " -h This help text." << endl; - cout << " -q Loggable output - no progress indicator" << endl; + cout << " -h This help text." << endl; + cout << " -q Loggable output - no progress indicator" << endl; cout << " -qq No output except for errors" << endl; cout << " -d Download only - do NOT install or unpack archives" << endl; cout << " -s No-act. Perform ordering simulation" << endl; @@ -661,7 +1077,7 @@ int ShowHelp() cout << " -u Show a list of upgraded packages as well" << endl; cout << " -c=? Read this configuration file" << endl; cout << " -o=? Set an arbitary configuration option, ie -o dir::cache=/tmp" << endl; - cout << "See the apt-get(8), sources.list(8) and apt.conf(8) manual" << endl; + cout << "See the apt-get(8), sources.list(5) and apt.conf(5) manual" << endl; cout << "pages for more information." << endl; return 100; } @@ -677,6 +1093,21 @@ void GetInitialize() _config->Set("APT::Get::Simulate",false); _config->Set("APT::Get::Assume-Yes",false); _config->Set("APT::Get::Fix-Broken",false); + _config->Set("APT::Get::Force-Yes",false); +} + /*}}}*/ +// SigWinch - Window size change signal handler /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void SigWinch(int) +{ + // Riped from GNU ls +#ifdef TIOCGWINSZ + struct winsize ws; + + if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5) + ScreenWidth = ws.ws_col - 1; +#endif } /*}}}*/ @@ -684,6 +1115,7 @@ int main(int argc,const char *argv[]) { CommandLine::Args Args[] = { {'h',"help","help",0}, + {'v',"version","version",0}, {'q',"quiet","quiet",CommandLine::IntLevel}, {'q',"silent","quiet",CommandLine::IntLevel}, {'d',"download-only","APT::Get::Download-Only",0}, @@ -695,10 +1127,26 @@ int main(int argc,const char *argv[]) {'y',"assume-yes","APT::Get::Assume-Yes",0}, {'f',"fix-broken","APT::Get::Fix-Broken",0}, {'u',"show-upgraded","APT::Get::Show-Upgraded",0}, - {'m',"ignore-missing","APT::Get::Fix-Broken",0}, + {'m',"ignore-missing","APT::Get::Fix-Missing",0}, + {0,"fix-missing","APT::Get::Fix-Missing",0}, + {0,"ignore-hold","APT::Ingore-Hold",0}, + {0,"no-upgrade","APT::Get::no-upgrade",0}, + {0,"force-yes","APT::Get::force-yes",0}, + {0,"print-uris","APT::Get::Print-URIs",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; + CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate}, + {"upgrade",&DoUpgrade}, + {"install",&DoInstall}, + {"remove",&DoInstall}, + {"dist-upgrade",&DoDistUpgrade}, + {"dselect-upgrade",&DoDSelectUpgrade}, + {"clean",&DoClean}, + {"autoclean",&DoAutoClean}, + {"check",&DoCheck}, + {"help",&ShowHelp}, + {0,0}}; // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); @@ -711,8 +1159,9 @@ int main(int argc,const char *argv[]) // See if the help should be shown if (_config->FindB("help") == true || + _config->FindB("version") == true || CmdL.FileSize() == 0) - return ShowHelp(); + return ShowHelp(CmdL); // Setup the output streams c0out.rdbuf(cout.rdbuf()); @@ -722,41 +1171,20 @@ int main(int argc,const char *argv[]) c0out.rdbuf(devnull.rdbuf()); if (_config->FindI("quiet",0) > 1) c1out.rdbuf(devnull.rdbuf()); + + // Setup the signals + signal(SIGPIPE,SIG_IGN); + signal(SIGWINCH,SigWinch); + SigWinch(0); // Match the operation - struct - { - const char *Match; - bool (*Handler)(CommandLine &); - } Map[] = {{"update",&DoUpdate}, - {"upgrade",&DoUpgrade}, - {"install",&DoInstall}, - {"dist-upgrade",&DoDistUpgrade}, - {"dselect-upgrade",&DoDSelectUpgrade}, - {"clean",&DoClean}, - {"check",&DoCheck}, - {0,0}}; - int I; - for (I = 0; Map[I].Match != 0; I++) - { - if (strcmp(CmdL.FileList[0],Map[I].Match) == 0) - { - Map[I].Handler(CmdL); - break; - } - } - - // No matching name - if (Map[I].Match == 0) - _error->Error("Invalid operation %s", CmdL.FileList[0]); + CmdL.DispatchArg(Cmds); // Print any errors or warnings found during parsing if (_error->empty() == false) { bool Errors = _error->PendingError(); _error->DumpErrors(); - if (Errors == true) - cout << "Returning 100." << endl; return Errors == true?100:0; }