List = new pkgOrderList(&Cache);
static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+ ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
+
+ if (Debug && ImmConfigureAll)
+ clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
// Generate the list of affected packages and sort it
for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
continue;
// Mark the package and its dependends for immediate configuration
- if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
+ if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
(I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
- NoImmConfigure == false)
+ NoImmConfigure == false) || ImmConfigureAll)
{
- if(Debug)
+ if(Debug && !ImmConfigureAll)
clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
List->Flag(I,pkgOrderList::Immediate);
-
- // Look for other install packages to make immediate configurea
- ImmediateAdd(I, true);
- // And again with the current version.
- ImmediateAdd(I, false);
+ if (!ImmConfigureAll) {
+ // Look for other install packages to make immediate configurea
+ ImmediateAdd(I, true);
+
+ // And again with the current version.
+ ImmediateAdd(I, false);
+ }
}
// Not interesting
{
PkgIterator Pkg(Cache,*I);
- if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false)
+ if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false) {
+ _error->Error("Internal error, packages left unconfigured. %s",Pkg.Name());
return false;
+ }
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
}
}
// Sanity Check
- if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
- return _error->Error(_("Could not perform immediate configuration on '%s'. "
+ if (List->IsFlag(Pkg,pkgOrderList::Configured) == false && Debug)
+ _error->Error(_("Could not perform immediate configuration on '%s'. "
"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
return true;
{
VerIterator Ver(Cache,*I);
PkgIterator Pkg = Ver.ParentPkg();
+ VerIterator InstallVer(Cache,Cache[Pkg].InstallVer);
+ VerIterator CandVer(Cache,Cache[Pkg].CandidateVer);
+
+ if (Debug && false) {
+ if (Ver==0) {
+ cout << OutputInDepth(Depth) << "Checking if " << Ver << " of " << Pkg.Name() << " satisfies this dependancy" << endl;
+ } else {
+ cout << OutputInDepth(Depth) << "Checking if " << Ver.VerStr() << " of " << Pkg.Name() << " satisfies this dependancy" << endl;
+ }
+
+ if (Pkg.CurrentVer()==0) {
+ cout << OutputInDepth(Depth) << " CurrentVer " << Pkg.CurrentVer() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
+ } else {
+ cout << OutputInDepth(Depth) << " CurrentVer " << Pkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(Pkg) << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << endl;
+ }
+
+ if (InstallVer==0) {
+ cout << OutputInDepth(Depth )<< " InstallVer " << InstallVer << endl;
+ } else {
+ cout << OutputInDepth(Depth )<< " InstallVer " << InstallVer.VerStr() << endl;
+ }
+ if (CandVer != 0)
+ cout << OutputInDepth(Depth ) << " CandVer " << CandVer.VerStr() << endl;
+ cout << OutputInDepth(Depth) << " Keep " << Cache[Pkg].Keep() << " Unpacked " << List->IsFlag(Pkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(Pkg,pkgOrderList::Configured) << endl;
+
+ }
// See if the current version is ok
if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
Pkg.State() == PkgIterator::NeedsNothing)
Bad = false;
continue;
}
-
+
// Not the install version
- if (Cache[Pkg].InstallVer != *I ||
+ if ((Cache[Pkg].InstallVer != *I && Cache[Pkg].CandidateVer != *I) ||
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing &&
(Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
continue;
if (Immediate == true &&
List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
if (SmartConfigure(Pkg) == false)
- return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'. "
+ _error->Warning(_("Could not perform immediate configuration on already unpacked '%s'. "
"Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
return true;
}
-
+
VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
/* See if this packages install version has any predependencies
while (End->Type == pkgCache::Dep::PreDepends)
{
- if (Debug == true)
+ if (Debug)
clog << "PreDepends order for " << Pkg.Name() << std::endl;
// Look for possible ok targets.
Pkg.State() == PkgIterator::NeedsNothing)
{
Bad = false;
- if (Debug == true)
+ if (Debug)
clog << "Found ok package " << Pkg.Name() << endl;
continue;
}
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
continue;
- if (Debug == true)
+ if (Debug)
clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
Bad = !SmartConfigure(Pkg);
}
End.TargetPkg().Name(),Pkg.Name());
Start++;
}
- else
+ else
break;
}
for (Version **I = VList; *I != 0; I++)
{
VerIterator Ver(Cache,*I);
- PkgIterator Pkg = Ver.ParentPkg();
+ PkgIterator ConflictPkg = Ver.ParentPkg();
+ VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);
// See if the current version is conflicting
- if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true)
+ if (ConflictPkg.CurrentVer() == Ver && !List->IsFlag(ConflictPkg,pkgOrderList::UnPacked))
{
- if (EarlyRemove(Pkg) == false)
- return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
+ if (Debug && false)
+ cout << " " << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
+
+ if (Debug && false) {
+ if (Ver==0) {
+ cout << " Checking if " << Ver << " of " << ConflictPkg.Name() << " satisfies this dependancy" << endl;
+ } else {
+ cout << " Checking if " << Ver.VerStr() << " of " << ConflictPkg.Name() << " satisfies this dependancy" << endl;
+ }
+
+ if (ConflictPkg.CurrentVer()==0) {
+ cout << " CurrentVer " << ConflictPkg.CurrentVer() << " IsNow " << List->IsNow(ConflictPkg) << " NeedsNothing " << (ConflictPkg.State() == PkgIterator::NeedsNothing) << endl;
+ } else {
+ cout << " CurrentVer " << ConflictPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(ConflictPkg) << " NeedsNothing " << (ConflictPkg.State() == PkgIterator::NeedsNothing) << endl;
+ }
+
+ if (InstallVer==0) {
+ cout << " InstallVer " << InstallVer << endl;
+ } else {
+ cout << " InstallVer " << InstallVer.VerStr() << endl;
+ }
+
+ cout << " Keep " << Cache[ConflictPkg].Keep() << " Unpacked " << List->IsFlag(ConflictPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(ConflictPkg,pkgOrderList::Configured) << " Removed " << List->IsFlag(ConflictPkg,pkgOrderList::Removed) << " Loop " << List->IsFlag(ConflictPkg,pkgOrderList::Loop) << endl;
+ cout << " Delete " << Cache[ConflictPkg].Delete() << endl;
+ }
+
+ if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) {
+ if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) {
+ cout << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
+ List->Flag(Pkg,pkgOrderList::Loop);
+ SmartUnPack(ConflictPkg,false);
+ } else {
+ if (EarlyRemove(ConflictPkg) == false)
+ return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
+ }
+ } else {
+ if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
+ cout << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl;
+ if (EarlyRemove(ConflictPkg) == false)
+ return _error->Error("Internal Error, Could not early remove %s",ConflictPkg.Name());
+ }
+ }
}
}
}
{
VerIterator Ver(Cache,*I);
PkgIterator BrokenPkg = Ver.ParentPkg();
+ VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+
+ cout << " " << Pkg.Name() << " breaks " << BrokenPkg.Name() << endl;
+ if (Debug && false) {
+ if (Ver==0) {
+ cout << " Checking if " << Ver << " of " << BrokenPkg.Name() << " satisfies this dependancy" << endl;
+ } else {
+ cout << " Checking if " << Ver.VerStr() << " of " << BrokenPkg.Name() << " satisfies this dependancy" << endl;
+ }
+
+ if (BrokenPkg.CurrentVer()==0) {
+ cout << " CurrentVer " << BrokenPkg.CurrentVer() << " IsNow " << List->IsNow(BrokenPkg) << " NeedsNothing " << (BrokenPkg.State() == PkgIterator::NeedsNothing) << endl;
+ } else {
+ cout << " CurrentVer " << BrokenPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(BrokenPkg) << " NeedsNothing " << (BrokenPkg.State() == PkgIterator::NeedsNothing) << endl;
+ }
+
+ if (InstallVer==0) {
+ cout << " InstallVer " << InstallVer << endl;
+ } else {
+ cout << " InstallVer " << InstallVer.VerStr() << endl;
+ }
+
+ cout << " Keep " << Cache[BrokenPkg].Keep() << " Unpacked " << List->IsFlag(BrokenPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(BrokenPkg,pkgOrderList::Configured) << " Removed " << List->IsFlag(BrokenPkg,pkgOrderList::Removed) << " Loop " << List->IsFlag(BrokenPkg,pkgOrderList::Loop) << " InList " << List->IsFlag(BrokenPkg,pkgOrderList::InList) << endl;
+ cout << " Delete " << Cache[BrokenPkg].Delete() << endl;
+ }
// Check if it needs to be unpacked
if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false &&
- !List->IsFlag(BrokenPkg,pkgOrderList::UnPacked)) {
- /* FIXME Setting the flag here prevents breakage loops, that can occur if BrokenPkg (or one of the
- packages it breaks) breaks Pkg */
- List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+ !List->IsFlag(BrokenPkg,pkgOrderList::Loop) && List->IsNow(BrokenPkg)) {
+ List->Flag(Pkg,pkgOrderList::Loop);
// Found a break, so unpack the package
+ if (Debug)
+ cout << " Unpacking " << BrokenPkg.Name() << " to avoid break" << endl;
SmartUnPack(BrokenPkg, false);
}
+ // Check if a package needs to be removed
+ if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured)) {
+ if (Debug)
+ cout << " Removing " << BrokenPkg.Name() << " to avoid break" << endl;
+ SmartRemove(BrokenPkg);
+ }
}
}
}
-
- // Check for reverse conflicts.
- if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
+
+ // FIXME: Crude but effective fix, allows the SmartUnPack method to be used for packages that new to the system
+ if (instVer != 0) {
+ //cout << "Check for reverse conflicts on " << Pkg.Name() << " " << instVer.VerStr() << endl;
+
+ // Check for reverse conflicts.
+ if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
instVer.VerStr()) == false)
- return false;
+ return false;
- for (PrvIterator P = instVer.ProvidesList();
- P.end() == false; P++)
- CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
+ for (PrvIterator P = instVer.ProvidesList();
+ P.end() == false; P++)
+ CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
- List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+ List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
- if (instVer->MultiArch == pkgCache::Version::Same)
- for (PkgIterator P = Pkg.Group().PackageList();
- P.end() == false; P = Pkg.Group().NextPkg(P))
- {
- if (Pkg == P || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
- Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
- (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
- continue;
- SmartUnPack(P, false);
- }
+ if (instVer->MultiArch == pkgCache::Version::Same)
+ for (PkgIterator P = Pkg.Group().PackageList();
+ P.end() == false; P = Pkg.Group().NextPkg(P))
+ {
+ if (Pkg == P || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
+ Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
+ (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
+ continue;
+ SmartUnPack(P, false);
+ }
+
+ } else {
+ VerIterator InstallVer(Cache,Cache[Pkg].InstallVer);
+ //cout << "Check for reverse conflicts on " << Pkg.Name() << " " << InstallVer.VerStr() << endl;
+
+ // Check for reverse conflicts.
+ if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
+ InstallVer.VerStr()) == false)
+ return false;
+
+ List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
+ }
if(Install(Pkg,FileNames[Pkg->ID]) == false)
return false;
+ /* Because of the ordered list, most dependancies should be unpacked,
+ however if there is a loop this is not the case, so check for dependancies before configuring.
+ This is done after the package installation as it makes it easier to deal with conflicts problems */
+ bool Bad = true;
+ for (DepIterator D = instVer.DependsList();
+ D.end() == false; )
+ {
+ // Compute a single dependency element (glob or)
+ pkgCache::DepIterator Start;
+ pkgCache::DepIterator End;
+ D.GlobOr(Start,End);
+
+ if (End->Type == pkgCache::Dep::Depends)
+ Bad = true;
+
+ // Check for dependanices that have not been unpacked, probably due to loops.
+ while (End->Type == pkgCache::Dep::Depends) {
+ PkgIterator DepPkg;
+ VerIterator InstallVer;
+ SPtrArray<Version *> VList = Start.AllTargets();
+
+ for (Version **I = VList; *I != 0; I++) {
+ VerIterator Ver(Cache,*I);
+ DepPkg = Ver.ParentPkg();
+
+ if (!Bad) continue;
+
+ InstallVer = VerIterator(Cache,Cache[DepPkg].InstallVer);
+ VerIterator CandVer(Cache,Cache[DepPkg].CandidateVer);
+
+ if (Debug && false) {
+ if (Ver==0) {
+ cout << " Checking if " << Ver << " of " << DepPkg.Name() << " satisfies this dependancy" << endl;
+ } else {
+ cout << " Checking if " << Ver.VerStr() << " of " << DepPkg.Name() << " satisfies this dependancy" << endl;
+ }
+
+ if (DepPkg.CurrentVer()==0) {
+ cout << " CurrentVer " << DepPkg.CurrentVer() << " IsNow " << List->IsNow(DepPkg) << " NeedsNothing " << (DepPkg.State() == PkgIterator::NeedsNothing) << endl;
+ } else {
+ cout << " CurrentVer " << DepPkg.CurrentVer().VerStr() << " IsNow " << List->IsNow(DepPkg) << " NeedsNothing " << (DepPkg.State() == PkgIterator::NeedsNothing) << endl;
+ }
+
+ if (InstallVer==0) {
+ cout << " InstallVer " << InstallVer << endl;
+ } else {
+ cout << " InstallVer " << InstallVer.VerStr() << endl;
+ }
+ if (CandVer != 0)
+ cout << " CandVer " << CandVer.VerStr() << endl;
+
+ cout << " Keep " << Cache[DepPkg].Keep() << " Unpacked " << List->IsFlag(DepPkg,pkgOrderList::UnPacked) << " Configured " << List->IsFlag(DepPkg,pkgOrderList::Configured) << endl;
+
+ }
+
+ // Check if it satisfies this dependancy
+ if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+ DepPkg.State() == PkgIterator::NeedsNothing)
+ {
+ Bad = false;
+ continue;
+ }
+
+ if (Cache[DepPkg].InstallVer == *I && !List->IsNow(DepPkg)) {
+ Bad = false;
+ continue;
+ }
+ }
+
+ if (InstallVer != 0 && Bad) {
+ Bad = false;
+ // Found a break, so unpack the package
+ List->Flag(Pkg,pkgOrderList::Loop);
+ if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
+ if (Debug)
+ cout << " Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+ SmartUnPack(DepPkg, false);
+ }
+ }
+
+ if (Start==End) {
+ if (Bad && Debug) {
+ if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) {
+ _error->Warning("Could not satisfy dependancies for %s",Pkg.Name());
+ }
+ }
+ break;
+
+ } else {
+ Start++;
+ }
+ }
+ }
+
// Perform immedate configuration of the package.
if (Immediate == true &&
- List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
+ List->IsFlag(Pkg,pkgOrderList::Immediate) == true && !Bad)
if (SmartConfigure(Pkg) == false)
- return _error->Error(_("Could not perform immediate configuration on '%s'. "
+ _error->Warning(_("Could not perform immediate configuration on '%s'. "
"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
return true;
for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
{
PkgIterator Pkg(Cache,*I);
-
+
if (List->IsNow(Pkg) == false)
{
- if (Debug == true)
- clog << "Skipping already done " << Pkg.Name() << endl;
+ if (!List->IsFlag(Pkg,pkgOrderList::Configured)) {
+ if (SmartConfigure(Pkg) == false && Debug)
+ _error->Warning("Internal Error, Could not configure %s",Pkg.Name());
+ // FIXME: The above warning message might need changing
+ } else {
+ if (Debug == true)
+ clog << "Skipping already done " << Pkg.Name() << endl;
+ }
continue;
+
}
if (List->IsMissing(Pkg) == true)
PkgIterator(Cache,*I).Name());
return Failed;
}
- }
+ }
return Completed;
}
projects / apt.git / blobdiff