X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/233c2b66e8972bddf34f291bdb2330ea134abc0f..1809f8d29cee7a6328be806548317bc99632a61b:/cmdline/apt-get.cc diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5bfe95d6a..857e8aa3f 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.114 2002/02/15 03:40:00 jgg Exp $ +// $Id: apt-get.cc,v 1.123 2002/11/09 20:50:30 doogie Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -46,7 +46,7 @@ #include "acqprogress.h" #include -#include +#include #include #include #include @@ -80,6 +80,13 @@ class CacheFile : public pkgCacheFile void Sort(); bool CheckDeps(bool AllowBroken = false); + bool BuildCaches(bool WithLock = true) + { + OpTextProgress Prog(*_config); + if (pkgCacheFile::BuildCaches(Prog,WithLock) == false) + return false; + return true; + } bool Open(bool WithLock = true) { OpTextProgress Prog(*_config); @@ -176,14 +183,14 @@ bool ShowList(ostream &out,string Title,string List) description. The output looks like: - Sorry, but the following packages have unmet dependencies: + The following packages have unmet dependencies: exim: Depends: libc6 (>= 2.1.94) but 2.1.3-10 is to be installed Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed Depends: libsasl7 but it is not going to be installed */ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) { - out << _("Sorry, but the following packages have unmet dependencies:") << endl; + out << _("The following packages have unmet dependencies:") << endl; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -512,7 +519,7 @@ void Stats(ostream &out,pkgDepCache &Dep) if (Downgrade != 0) ioprintf(out,_("%lu downgraded, "),Downgrade); - ioprintf(out,_("%lu to remove and %lu not upgraded.\n"), + ioprintf(out,_("%lu to remove and %lu not upgraded.\n"), Dep.DelCount(),Dep.KeepCount()); if (Dep.BadCount() != 0) @@ -703,18 +710,18 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // Number of bytes if (DebBytes != FetchBytes) - ioprintf(c1out,_("Need to get %sB/%sB of archives. "), + ioprintf(c1out,_("Need to get %sB/%sB of archives.\n"), SizeToStr(FetchBytes).c_str(),SizeToStr(DebBytes).c_str()); else - ioprintf(c1out,_("Need to get %sB of archives. "), + ioprintf(c1out,_("Need to get %sB of archives.\n"), SizeToStr(DebBytes).c_str()); // Size delta if (Cache->UsrSize() >= 0) - ioprintf(c1out,_("After unpacking %sB will be used.\n"), + ioprintf(c1out,_("After unpacking %sB of additional disk space will be used.\n"), SizeToStr(Cache->UsrSize()).c_str()); else - ioprintf(c1out,_("After unpacking %sB will be freed.\n"), + ioprintf(c1out,_("After unpacking %sB disk space will be freed.\n"), SizeToStr(-1*Cache->UsrSize()).c_str()); if (_error->PendingError() == true) @@ -722,7 +729,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, /* Check for enough free space, but only if we are actually going to download */ - if (_config->FindB("APT::Get::Print-URIs") == false) + if (_config->FindB("APT::Get::Print-URIs") == false && + _config->FindB("APT::Get::Download",true) == true) { struct statvfs Buf; string OutputDir = _config->FindDir("Dir::Cache::Archives"); @@ -730,7 +738,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return _error->Errno("statvfs","Couldn't determine free space in %s", OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("Sorry, you don't have enough free space in %s to hold all the .debs."), + return _error->Error(_("You don't have enough free space in %s."), OutputDir.c_str()); } @@ -926,10 +934,15 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgDepCache::StateCache &State = Cache[Pkg]; if (Remove == true && Pkg->CurrentVer == 0) { + Fix.Clear(Pkg); + Fix.Protect(Pkg); + Fix.Remove(Pkg); + /* We want to continue searching for regex hits, so we return false here otherwise this is not really an error. */ if (AllowFail == false) - return false; + return false; + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name()); return true; } @@ -1004,7 +1017,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (_config->FindB("APT::Get::ReInstall",false) == true) { if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Sorry, re-installation of %s is not possible, it cannot be downloaded.\n"), + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), Pkg.Name()); else Cache.SetReInstall(Pkg,true); @@ -1012,7 +1025,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, else { if (AllowFail == true) - ioprintf(c1out,_("Sorry, %s is already the newest version.\n"), + ioprintf(c1out,_("%s is already the newest version.\n"), Pkg.Name()); } } @@ -1031,7 +1044,8 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, const char *VerTag,bool IsRel) { - pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release:pkgVersionMatch::Version)); + pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release : + pkgVersionMatch::Version)); pkgCache::VerIterator Ver = Match.Find(Pkg); @@ -1175,11 +1189,21 @@ bool DoUpdate(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); pkgAcquire Fetcher(&Stat); - + // Populate it with the source selection if (List.GetIndexes(&Fetcher) == false) return false; + // Just print out the uris an exit if the --print-uris flag was used + 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() == pkgAcquire::Failed) return false; @@ -1207,7 +1231,7 @@ bool DoUpdate(CommandLine &CmdL) // Prepare the cache. CacheFile Cache; - if (Cache.Open() == false) + if (Cache.BuildCaches() == false) return false; if (Failed == true) @@ -1316,7 +1340,8 @@ bool DoInstall(CommandLine &CmdL) // Check if the name is a regex const char *I; for (I = S; *I != 0; I++) - if (*I == '.' || *I == '?' || *I == '*' || *I == '|') + if (*I == '?' || *I == '*' || *I == '|' || + *I == '[' || *I == '^' || *I == '$') break; if (*I == 0) return _error->Error(_("Couldn't find package %s"),S); @@ -1330,7 +1355,7 @@ bool DoInstall(CommandLine &CmdL) if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; + char Error[300]; regerror(Res,&Pattern,Error,sizeof(Error)); return _error->Error(_("Regex compilation error - %s"),Error); } @@ -1342,6 +1367,9 @@ bool DoInstall(CommandLine &CmdL) if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) continue; + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), + Pkg.Name(),S); + if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; @@ -1400,7 +1428,7 @@ bool DoInstall(CommandLine &CmdL) c1out << _("The following information may help to resolve the situation:") << endl; c1out << endl; ShowBroken(c1out,Cache,false); - return _error->Error(_("Sorry, broken packages")); + return _error->Error(_("Broken packages")); } /* Print out a list of packages that are going to be installed extra @@ -1697,7 +1725,7 @@ bool DoSource(CommandLine &CmdL) return _error->Errno("statvfs","Couldn't determine free space in %s", OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) - return _error->Error(_("Sorry, you don't have enough free space in %s"), + return _error->Error(_("You don't have enough free space in %s"), OutputDir.c_str()); // Number of bytes