X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2d425135df32b7700762d65e0316351537e94c63..5d1d073836e1b26dfa27dbc04eb9ce21bd369f67:/cmdline/apt-get.cc diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 98461051e..75d375453 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.115 2002/03/20 05:51:52 jgg Exp $ +// $Id: apt-get.cc,v 1.131 2003/07/22 01:49:26 mdz 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); @@ -143,29 +150,59 @@ bool AnalPrompt(const char *Text) // --------------------------------------------------------------------- /* This prints out a string of space separated words with a title and a two space indent line wraped to the current screen width. */ -bool ShowList(ostream &out,string Title,string List) +bool ShowList(ostream &out,string Title,string List,string VersionsList) { if (List.empty() == true) return true; + // trim trailing space + int NonSpace = List.find_last_not_of(' '); + if (NonSpace != -1) + { + List = List.erase(NonSpace + 1); + if (List.empty() == true) + return true; + } // Acount for the leading space int ScreenWidth = ::ScreenWidth - 3; out << Title << endl; string::size_type Start = 0; + string::size_type VersionsStart = 0; while (Start < List.size()) { - string::size_type End; - if (Start + ScreenWidth >= List.size()) - End = List.size(); - else - End = List.rfind(' ',Start+ScreenWidth); - - if (End == string::npos || End < Start) - End = Start + ScreenWidth; - out << " " << string(List,Start,End - Start) << endl; - Start = End + 1; + if(_config->FindB("APT::Get::Show-Versions",false) == true && + VersionsList.size() > 0) { + string::size_type End; + string::size_type VersionsEnd; + + End = List.find(' ',Start); + VersionsEnd = VersionsList.find('\n', VersionsStart); + + out << " " << string(List,Start,End - Start) << " (" << + string(VersionsList,VersionsStart,VersionsEnd - VersionsStart) << + ")" << endl; + + if (End == string::npos || End < Start) + End = Start + ScreenWidth; + + Start = End + 1; + VersionsStart = VersionsEnd + 1; + } else { + string::size_type End; + + if (Start + ScreenWidth >= List.size()) + End = List.size(); + else + End = List.rfind(' ',Start+ScreenWidth); + + if (End == string::npos || End < Start) + End = Start + ScreenWidth; + out << " " << string(List,Start,End - Start) << endl; + Start = End + 1; + } } + return false; } /*}}}*/ @@ -176,14 +213,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]); @@ -311,14 +348,17 @@ void ShowNew(ostream &out,CacheFile &Cache) /* Print out a list of packages that are going to be removed extra to what the user asked */ string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); - if (Cache[I].NewInstall() == true) - List += string(I.Name()) + " "; + if (Cache[I].NewInstall() == true) { + List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } - ShowList(out,_("The following NEW packages will be installed:"),List); + ShowList(out,_("The following NEW packages will be installed:"),List,VersionsList); } /*}}}*/ // ShowDel - Show packages to delete /*{{{*/ @@ -329,6 +369,7 @@ void ShowDel(ostream &out,CacheFile &Cache) /* Print out a list of packages that are going to be removed extra to what the user asked */ string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -338,10 +379,12 @@ void ShowDel(ostream &out,CacheFile &Cache) List += string(I.Name()) + "* "; else List += string(I.Name()) + " "; + + VersionsList += string(Cache[I].CandVersion)+ "\n"; } } - ShowList(out,_("The following packages will be REMOVED:"),List); + ShowList(out,_("The following packages will be REMOVED:"),List,VersionsList); } /*}}}*/ // ShowKept - Show kept packages /*{{{*/ @@ -350,6 +393,7 @@ void ShowDel(ostream &out,CacheFile &Cache) void ShowKept(ostream &out,CacheFile &Cache) { string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -360,8 +404,9 @@ void ShowKept(ostream &out,CacheFile &Cache) continue; List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } - ShowList(out,_("The following packages have been kept back"),List); + ShowList(out,_("The following packages have been kept back"),List,VersionsList); } /*}}}*/ // ShowUpgraded - Show upgraded packages /*{{{*/ @@ -370,6 +415,7 @@ void ShowKept(ostream &out,CacheFile &Cache) void ShowUpgraded(ostream &out,CacheFile &Cache) { string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -379,8 +425,9 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) continue; List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } - ShowList(out,_("The following packages will be upgraded"),List); + ShowList(out,_("The following packages will be upgraded"),List,VersionsList); } /*}}}*/ // ShowDowngraded - Show downgraded packages /*{{{*/ @@ -389,6 +436,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) bool ShowDowngraded(ostream &out,CacheFile &Cache) { string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -398,8 +446,9 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) continue; List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } - return ShowList(out,_("The following packages will be DOWNGRADED"),List); + return ShowList(out,_("The following packages will be DOWNGRADED"),List,VersionsList); } /*}}}*/ // ShowHold - Show held but changed packages /*{{{*/ @@ -408,15 +457,18 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) bool ShowHold(ostream &out,CacheFile &Cache) { string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && - I->SelectedState == pkgCache::State::Hold) - List += string(I.Name()) + " "; + I->SelectedState == pkgCache::State::Hold) { + List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; + } } - return ShowList(out,_("The following held packages will be changed:"),List); + return ShowList(out,_("The following held packages will be changed:"),List,VersionsList); } /*}}}*/ // ShowEssential - Show an essential package warning /*{{{*/ @@ -427,6 +479,7 @@ bool ShowHold(ostream &out,CacheFile &Cache) bool ShowEssential(ostream &out,CacheFile &Cache) { string List; + string VersionsList; bool *Added = new bool[Cache->Head().PackageCount]; for (unsigned int I = 0; I != Cache->Head().PackageCount; I++) Added[I] = false; @@ -445,6 +498,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) { Added[I->ID] = true; List += string(I.Name()) + " "; + //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } @@ -469,13 +523,14 @@ bool ShowEssential(ostream &out,CacheFile &Cache) char S[300]; snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name()); List += S; + //VersionsList += "\n"; ??? } } } delete [] Added; return ShowList(out,_("WARNING: The following essential packages will be removed\n" - "This should NOT be done unless you know exactly what you are doing!"),List); + "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList); } /*}}}*/ // Stats - Show some statistics /*{{{*/ @@ -630,7 +685,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (_config->FindB("APT::Get::Show-Upgraded",false) == true) ShowUpgraded(c1out,Cache); Fail |= !ShowDowngraded(c1out,Cache); - Essential = !ShowEssential(c1out,Cache); + if (_config->FindB("APT::Get::Download-Only",false) == false) + Essential = !ShowEssential(c1out,Cache); Fail |= Essential; Stats(c1out,Cache); @@ -703,18 +759,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 +778,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 +787,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 +983,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; } @@ -969,6 +1031,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, "of sources.list\n"),Pkg.Name()); string List; + string VersionsList; SPtrArray Seen = new bool[Cache.Head().PackageCount]; memset(Seen,0,Cache.Head().PackageCount*sizeof(*Seen)); pkgCache::DepIterator Dep = Pkg.RevDependsList(); @@ -980,8 +1043,9 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, continue; Seen[Dep.ParentPkg()->ID] = true; List += string(Dep.ParentPkg().Name()) + " "; + //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? } - ShowList(c1out,_("However the following packages replace it:"),List); + ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); } _error->Error(_("Package %s has no installation candidate"),Pkg.Name()); @@ -1004,7 +1068,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 +1076,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 +1095,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 +1240,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 +1282,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 +1391,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 +1406,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 +1418,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 +1479,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 @@ -1408,6 +1487,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->InstCount() != ExpectedInst) { string List; + string VersionsList; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { pkgCache::PkgIterator I(Cache,Cache.List[J]); @@ -1419,11 +1499,79 @@ bool DoInstall(CommandLine &CmdL) if (strcmp(*J,I.Name()) == 0) break; - if (*J == 0) + if (*J == 0) { List += string(I.Name()) + " "; + VersionsList += string(Cache[I].CandVersion) + "\n"; + } } - ShowList(c1out,_("The following extra packages will be installed:"),List); + ShowList(c1out,_("The following extra packages will be installed:"),List,VersionsList); + } + + /* Print out a list of suggested and recommended packages */ + { + string SuggestsList, RecommendsList, List; + string SuggestsVersions, RecommendsVersions; + for (unsigned J = 0; J < Cache->Head().PackageCount; J++) + { + pkgCache::PkgIterator I(Cache,Cache.List[J]); + + /* Just look at the ones we want to install */ + if ((*Cache)[I].Install() == false) + continue; + + for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++) + { + for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) + { + pkgCache::DepIterator Start; + pkgCache::DepIterator End; + D.GlobOr(Start,End); + do + { + if (Start->Type == pkgCache::Dep::Suggests) { + + /* A suggests relations, let's see if we have it + installed already */ + + string target = string(Start.TargetPkg().Name()) + " "; + if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install) + break; + /* Does another package suggest it as well? If so, + don't print it twice */ + if (int(SuggestsList.find(target)) > -1) + break; + SuggestsList += target; + SuggestsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n"; + } + + if (Start->Type == pkgCache::Dep::Recommends) { + + /* A recommends relation, let's see if we have it + installed already */ + + string target = string(Start.TargetPkg().Name()) + " "; + if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install) + break; + + /* Does another package recommend it as well? If so, + don't print it twice */ + + if (int(RecommendsList.find(target)) > -1) + break; + RecommendsList += target; + SuggestsVersions += string(Cache[Start.TargetPkg()].CandVersion) + "\n"; + } + if (Start == End) + break; + Start++; + } while (1); + } + } + } + ShowList(c1out,_("Suggested packages:"),SuggestsList,SuggestsVersions); + ShowList(c1out,_("Recommended packages:"),RecommendsList,RecommendsVersions); + } // See if we need to prompt @@ -1697,7 +1845,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 @@ -1892,32 +2040,53 @@ bool DoBuildDep(CommandLine &CmdL) pkgProblemResolver Fix(Cache); for (D = BuildDeps.begin(); D != BuildDeps.end(); D++) { - pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package); - if (Pkg.end() == true) + if ((*D).Type == pkgSrcRecords::Parser::BuildConflict || + (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep) { - /* for a build-conflict; ignore unknown packages */ - if ((*D).Type == pkgSrcRecords::Parser::BuildConflict || - (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep) - continue; - - return _error->Error(_("%s dependency on %s cannot be satisfied because the package %s cannot be found"), - Last->BuildDepType((*D).Type),Src.c_str(),(*D).Package.c_str()); + pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package); + // Build-conflicts on unknown packages are silently ignored + if (Pkg.end() == true) + continue; + + pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache); + + /* + * Remove if we have an installed version that satisfies the + * version criteria + */ + if (IV.end() == false && + Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) + TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst); } - pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache); - - if ((*D).Type == pkgSrcRecords::Parser::BuildConflict || - (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep) - { - /* - * conflict; need to remove if we have an installed version - * that satisfies the version criterial - */ - if (IV.end() == false && - Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) - TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst); - } - else - { + else // BuildDep || BuildDepIndep + { + pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package); + if (Pkg.end() == true) + { + // Check if there are any alternatives + if (((*D).Op & pkgCache::Dep::Or) != pkgCache::Dep::Or) + return _error->Error(_("%s dependency for %s cannot be satisfied " + "because the package %s cannot be found"), + Last->BuildDepType((*D).Type),Src.c_str(), + (*D).Package.c_str()); + // Try the next alternative + continue; + } + + /* + * if there are alternatives, we've already picked one, so skip + * the rest + * + * TODO: this means that if there's a build-dep on A|B and B is + * installed, we'll still try to install A; more importantly, + * if A is currently broken, we cannot go back and try B. To fix + * this would require we do a Resolve cycle for each package we + * add to the install list. Ugh + */ + while (D != BuildDeps.end() && + (((*D).Op & pkgCache::Dep::Or) == pkgCache::Dep::Or)) + D++; + /* * If this is a virtual package, we need to check the list of * packages that provide it and see if any of those are @@ -1927,22 +2096,35 @@ bool DoBuildDep(CommandLine &CmdL) for (; Prv.end() != true; Prv++) if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false) break; - - if (Prv.end() == true) - { - /* - * depends; need to install or upgrade if we don't have the - * package installed or if the version does not satisfy the - * build dep. This is complicated by the fact that if we - * depend on a version lower than what we already have - * installed it is not clear what should be done; in practice - * this case should be rare though and right now nothing - * is done about it :-( - */ - if (IV.end() == true || - Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == false) - TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst); - } + + // Get installed version and version we are going to install + pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache); + pkgCache::VerIterator CV = (*Cache)[Pkg].CandidateVerIter(*Cache); + + for (; CV.end() != true; CV++) + { + if (Cache->VS().CheckDep(CV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) + break; + } + if (CV.end() == true) + return _error->Error(_("%s dependency for %s cannot be satisfied " + "because no available versions of package %s " + "can satisfy version requirements"), + Last->BuildDepType((*D).Type),Src.c_str(), + (*D).Package.c_str()); + + /* + * TODO: if we depend on a version lower than what we already have + * installed it is not clear what should be done; in practice + * this case should be rare, and right now nothing is + * done about it :-( + */ + if (Prv.end() == true && // Nothing provides it; and + (IV.end() == true || // It is not installed, or + Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == false)) + // the version installed doesn't + // satisfy constraints + TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst); } } @@ -2062,6 +2244,7 @@ bool ShowHelp(CommandLine &CmdL) " -m Attempt to continue if archives are unlocatable\n" " -u Show a list of upgraded packages as well\n" " -b Build the source package after fetching it\n" + " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" @@ -2105,6 +2288,7 @@ int main(int argc,const char *argv[]) CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, + {'V',"verbose-versions","APT::Get::Show-Versions",0}, {'q',"quiet","quiet",CommandLine::IntLevel}, {'q',"silent","quiet",CommandLine::IntLevel}, {'d',"download-only","APT::Get::Download-Only",0},