summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2011-07-05 11:30:35 +0100
committerChristopher Baines <cbaines8@gmail.com>2011-07-05 11:30:35 +0100
commit4e9ccfb2ff599b7a65ecec3c2f1383636f068f0c (patch)
treea008d175fbf29f075c100445f6c529587a3bdc25 /apt-pkg
parente2ca62725f8c511e53cf6b3abeede435a59eae3f (diff)
Removed some debug stuff, corrected the VerifyConfigure calls to VerifyAndConfigure
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/packagemanager.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index ab1b13de8..f0ad74ca8 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -278,7 +278,7 @@ bool pkgPackageManager::ConfigureAll()
{
PkgIterator Pkg(Cache,*I);
- if (ConfigurePkgs == true && VerifyConfigure(Pkg,OList) == false)
+ if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false)
return false;
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
@@ -313,7 +313,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
{
PkgIterator Pkg(Cache,*I);
- if (ConfigurePkgs == true && VerifyConfigure(Pkg,OList) == false)
+ if (ConfigurePkgs == true && VerifyAndConfigure(Pkg,OList) == false)
return false;
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
@@ -346,9 +346,6 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
configured*/
bool pkgPackageManager::VerifyConfigure(PkgIterator Pkg, pkgOrderList &OList)
{
- if (Debug == true)
- clog << "VerifyConfigure " << Pkg.Name() << endl;
-
// If this is true at the end, then the package should not be configured
bool error=true;
// This holds the the OR status of the previous dependancy
@@ -419,7 +416,7 @@ bool pkgPackageManager::VerifyConfigure(PkgIterator Pkg, pkgOrderList &OList)
configures it */
bool pkgPackageManager::VerifyAndConfigure(PkgIterator Pkg, pkgOrderList &OList)
{
- if (VerifyConfigure(Pkg, OList))
+ if (VerifyConfigure(Pkg, OList))
return Configure(Pkg);
else
return false;
@@ -472,15 +469,13 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
PkgIterator Pkg = Ver.ParentPkg();
// See if the current version is ok
- if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
+ if (Pkg.CurrentVer() == Ver && List->IsFlag(Pkg,pkgOrderList::Configured) == true &&
Pkg.State() == PkgIterator::NeedsNothing)
{
Bad = false;
continue;
}
- std::clog << OutputInDepth(Depth) << Pkg.Name() << " NeedsNothing " << (Pkg.State() == PkgIterator::NeedsNothing) << " Unpacked " << List->IsFlag(Pkg,pkgOrderList::UnPacked) << std::endl;
-
// Not the install version
if (Cache[Pkg].InstallVer != *I ||
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))