// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.130 2003/05/19 17:30:12 doogie Exp $
+// $Id: apt-get.cc,v 1.143 2003/09/24 04:00:25 mdz Exp $
/* ######################################################################
apt-get - Cover for dpkg
#include "acqprogress.h"
#include <locale.h>
+#include <langinfo.h>
#include <fstream>
#include <termios.h>
#include <sys/ioctl.h>
/* Returns true on a Yes.*/
bool YnPrompt()
{
- // This needs to be a capital
- const char *Yes = _("Y");
-
if (_config->FindB("APT::Get::Assume-Yes",false) == true)
{
- c1out << Yes << endl;
+ c1out << _("Y") << endl;
return true;
}
-
- char C = 0;
- char Jnk = 0;
- if (read(STDIN_FILENO,&C,1) != 1)
+
+ char response[1024] = "";
+ cin.getline(response, sizeof(response));
+
+ if (!cin)
return false;
- while (C != '\n' && Jnk != '\n')
- if (read(STDIN_FILENO,&Jnk,1) != 1)
- return false;
+
+ if (strlen(response) == 0)
+ return true;
+
+ regex_t Pattern;
+ int Res;
+
+ Res = regcomp(&Pattern, nl_langinfo(YESEXPR),
+ REG_EXTENDED|REG_ICASE|REG_NOSUB);
+
+ if (Res != 0) {
+ char Error[300];
+ regerror(Res,&Pattern,Error,sizeof(Error));
+ return _error->Error(_("Regex compilation error - %s"),Error);
+ }
- if (!(toupper(C) == *Yes || C == '\n' || C == '\r'))
- return false;
- return true;
+ Res = regexec(&Pattern, response, 0, NULL, 0);
+ if (Res == 0)
+ return true;
+ return false;
}
/*}}}*/
// AnalPrompt - Annoying Yes No Prompt. /*{{{*/
/* */
void ShowNew(ostream &out,CacheFile &Cache)
{
- /* Print out a list of packages that are going to be removed extra
+ /* Print out a list of packages that are going to be installed extra
to what the user asked */
string List;
string VersionsList;
ReInstall++;
}
- ioprintf(out,_("%lu packages upgraded, %lu newly installed, "),
+ ioprintf(out,_("%lu upgraded, %lu newly installed, "),
Upgrade,Install);
if (ReInstall != 0)
Dep.DelCount(),Dep.KeepCount());
if (Dep.BadCount() != 0)
- ioprintf(out,_("%lu packages not fully installed or removed.\n"),
+ ioprintf(out,_("%lu not fully installed or removed.\n"),
Dep.BadCount());
}
/*}}}*/
if (ShwKept == true)
ShowKept(c1out,Cache);
Fail |= !ShowHold(c1out,Cache);
- if (_config->FindB("APT::Get::Show-Upgraded",false) == true)
+ if (_config->FindB("APT::Get::Show-Upgraded",true) == 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);
while (Cache->FindPkg(S).end() == true)
{
// Handle an optional end tag indicating what to do
- if (S[Length - 1] == '-')
+ if (Length >= 1 && S[Length - 1] == '-')
{
Remove = true;
S[--Length] = 0;
continue;
}
- if (S[Length - 1] == '+')
+ if (Length >= 1 && S[Length - 1] == '+')
{
Remove = false;
S[--Length] = 0;
pkgCache::DepIterator Start;
pkgCache::DepIterator End;
D.GlobOr(Start,End);
+
+ /*
+ * If this is a virtual package, we need to check the list of
+ * packages that provide it and see if any of those are
+ * installed
+ */
+ pkgCache::PrvIterator Prv = Start.TargetPkg().ProvidesList();
+ bool providedBySomething = false;
+ for (; Prv.end() != true; Prv++)
+ if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false) {
+ providedBySomething = true;
+ break;
+ }
+
+ if (providedBySomething) continue;
+
do
{
if (Start->Type == pkgCache::Dep::Suggests) {
installed already */
string target = string(Start.TargetPkg().Name()) + " ";
- if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install)
+ if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install())
break;
/* Does another package suggest it as well? If so,
don't print it twice */
installed already */
string target = string(Start.TargetPkg().Name()) + " ";
- if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install)
+ if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install())
break;
/* Does another package recommend it as well? If so,
rec.Package = Opts->Value;
rec.Type = pkgSrcRecords::Parser::BuildDependIndep;
rec.Op = 0;
- BuildDeps.insert(BuildDeps.begin(), rec);
+ BuildDeps.push_back(rec);
}
if (BuildDeps.size() == 0)
unsigned int ExpectedInst = 0;
vector <pkgSrcRecords::Parser::BuildDepRec>::iterator D;
pkgProblemResolver Fix(Cache);
+ bool skipAlternatives = false; // skip remaining alternatives in an or group
for (D = BuildDeps.begin(); D != BuildDeps.end(); D++)
{
+ bool hasAlternatives = (((*D).Op & pkgCache::Dep::Or) == pkgCache::Dep::Or);
+
+ if (skipAlternatives == true)
+ {
+ if (!hasAlternatives)
+ skipAlternatives = false; // end of or group
+ continue;
+ }
+
if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||
(*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
{
else // BuildDep || BuildDepIndep
{
pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << "Looking for " << (*D).Package << "...\n";
+
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 (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " (not found)" << (*D).Package << endl;
+
+ if (hasAlternatives)
+ continue;
+
+ 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());
}
/*
* 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
*/
pkgCache::PrvIterator Prv = Pkg.ProvidesList();
for (; Prv.end() != true; Prv++)
+ {
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " Checking provider " << Prv.OwnerPkg().Name() << endl;
+
if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
break;
+ }
// 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 ((*D).Version[0] != '\0') {
+ // Versioned dependency
+
+ 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());
+ }
+ else
{
- if (Cache->VS().CheckDep(CV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
- break;
+ // Only consider virtual packages if there is no versioned dependency
+ if (Prv.end() == false)
+ {
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " Is provided by installed package " << Prv.OwnerPkg().Name() << endl;
+ skipAlternatives = hasAlternatives;
+ continue;
+ }
}
- 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);
+ if (IV.end() == false)
+ {
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " Is installed\n";
+
+ if (Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+ {
+ skipAlternatives = hasAlternatives;
+ continue;
+ }
+
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " ...but the installed version doesn't meet the version requirement\n";
+
+ if (((*D).Op & pkgCache::Dep::LessEq) == pkgCache::Dep::LessEq)
+ {
+ return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"),
+ Last->BuildDepType((*D).Type),
+ Src.c_str(),
+ Pkg.Name());
+ }
+ }
+
+
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " Trying to install " << (*D).Package << endl;
+
+ if (TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst) == true)
+ {
+ // We successfully installed something; skip remaining alternatives
+ skipAlternatives = hasAlternatives;
+ continue;
+ }
+ else if (hasAlternatives)
+ {
+ if (_config->FindB("Debug::BuildDeps",false) == true)
+ cout << " Unsatisfiable, trying alternatives\n";
+ continue;
+ }
+ else
+ {
+ return _error->Error(_("Failed to satisfy %s dependency for %s: %s"),
+ Last->BuildDepType((*D).Type),
+ Src.c_str(),
+ (*D).Package.c_str());
+ }
}
}
// Now we check the state of the packages,
if (Cache->BrokenCount() != 0)
- return _error->Error(_("Some broken packages were found while trying to process build-dependencies.\n"
- "You might want to run `apt-get -f install' to correct these."));
+ return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
+ "You might want to run `apt-get -f install' to correct these."),*I);
}
if (InstallPackages(Cache, false, true) == false)