|
|
@@ -127,8 +127,9 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg)
|
|
|
if (FileList[Pkg->ID].empty() == false)
|
|
|
return false;
|
|
|
|
|
|
+ // Missing Pseudo packages are missing if the real package is missing
|
|
|
if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true)
|
|
|
- return false;
|
|
|
+ return IsMissing(Pkg.Group().FindPkg("all"));
|
|
|
|
|
|
return true;
|
|
|
}
|
|
|
@@ -203,7 +204,7 @@ bool pkgOrderList::OrderCritical()
|
|
|
{
|
|
|
PkgIterator P(Cache,*I);
|
|
|
if (IsNow(P) == true)
|
|
|
- clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
|
|
|
+ clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -276,7 +277,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
|
|
|
{
|
|
|
PkgIterator P(Cache,*I);
|
|
|
if (IsNow(P) == true)
|
|
|
- clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
|
|
|
+ clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -547,7 +548,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
|
|
|
if (Debug == true)
|
|
|
{
|
|
|
for (int j = 0; j != Depth; j++) clog << ' ';
|
|
|
- clog << "Visit " << Pkg.Name() << endl;
|
|
|
+ clog << "Visit " << Pkg.FullName() << endl;
|
|
|
}
|
|
|
|
|
|
Depth++;
|
|
|
@@ -606,7 +607,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg)
|
|
|
if (Debug == true)
|
|
|
{
|
|
|
for (int j = 0; j != Depth; j++) clog << ' ';
|
|
|
- clog << "Leave " << Pkg.Name() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl;
|
|
|
+ clog << "Leave " << Pkg.FullName() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl;
|
|
|
}
|
|
|
|
|
|
return true;
|