summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-03-07 09:20:31 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-03-07 09:20:31 +0100
commitc4f931f8570519323a49f320258e0ae9fb121acb (patch)
treee303906b6088342dd165fdd733580d0482d8ffc4 /apt-pkg
parent6845391844315cde1b95b1c5b6bbe28ee2cdf51b (diff)
* apt-pkg/packagemanager.cc:
- fix inconsistent clog/cout usage in the debug output
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/packagemanager.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 382ee4383..48c380be3 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -413,7 +413,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
{
List->Flag(Pkg,pkgOrderList::Loop);
if (Debug)
- cout << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
+ clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.Name() << " to avoid loop" << endl;
SmartUnPack(DepPkg, true, Depth + 1);
List->RmFlag(Pkg,pkgOrderList::Loop);
}
@@ -547,12 +547,12 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.Name();
VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
if (Pkg.CurrentVer() == 0)
- cout << " (install version " << InstallVer.VerStr() << ")";
+ clog << " (install version " << InstallVer.VerStr() << ")";
else
- cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+ clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
if (PkgLoop)
- cout << " (Only Perform PreUnpack Checks)";
- cout << endl;
+ clog << " (Only Perform PreUnpack Checks)";
+ clog << endl;
}
VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
@@ -655,13 +655,13 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
// See if the current version is conflicting
if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
{
- cout << OutputInDepth(Depth) << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
+ clog << OutputInDepth(Depth) << Pkg.Name() << " conflicts with " << ConflictPkg.Name() << endl;
/* If a loop is not present or has not yet been detected, attempt to unpack packages
to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */
if (!List->IsFlag(ConflictPkg,pkgOrderList::Loop)) {
if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0) {
if (Debug)
- cout << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
+ clog << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.Name() << " to prevent conflict" << endl;
List->Flag(Pkg,pkgOrderList::Loop);
SmartUnPack(ConflictPkg,false, Depth + 1);
// Remove loop to allow it to be used later if needed
@@ -673,7 +673,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
} else {
if (!List->IsFlag(ConflictPkg,pkgOrderList::Removed)) {
if (Debug)
- cout << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.Name() << " to conflict violation" << endl;
+ clog << OutputInDepth(Depth) << "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());
}
@@ -728,17 +728,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
if (circle == true)
{
if (Debug)
- cout << OutputInDepth(Depth) << " Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
+ clog << OutputInDepth(Depth) << " Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
continue;
}
else
{
if (Debug)
{
- cout << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
+ clog << OutputInDepth(Depth) << " Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
if (PkgLoop == true)
- cout << " (Looping)";
- cout << std::endl;
+ clog << " (Looping)";
+ clog << std::endl;
}
if (PkgLoop == false)
List->Flag(Pkg,pkgOrderList::Loop);
@@ -752,7 +752,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
if (Cache[BrokenPkg].Delete() == true && !List->IsFlag(BrokenPkg,pkgOrderList::Configured))
{
if (Debug)
- cout << OutputInDepth(Depth) << " Removing " << BrokenPkg.Name() << " to avoid " << End << endl;
+ clog << OutputInDepth(Depth) << " Removing " << BrokenPkg.Name() << " to avoid " << End << endl;
SmartRemove(BrokenPkg);
}
}