diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2011-08-13 17:29:49 +0100 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2011-08-13 17:29:49 +0100 |
| commit | 165ff1df10fd5960b5f31ce4e3eaa8d41a8e7b67 (patch) | |
| tree | 722906756af70d62bca432dde1893b7992cd730a /apt-pkg/packagemanager.cc | |
| parent | a99d02a86c5c25c4a36f06aa44c01709de8219c4 (diff) | |
Fix a bug introduced in Rev.2159 on line 398, also fix another potential bug.
Diffstat (limited to 'apt-pkg/packagemanager.cc')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 7a0f11d85..ee4798911 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -322,7 +322,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) { if (Debug) { VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); - clog << "SmartConfigure " << Pkg.Name() << InstallVer.VerStr() << endl; + clog << "SmartConfigure " << Pkg.Name() << " " << InstallVer.VerStr() << endl; } // If this is true, only check and correct and dependancies without the Loop flag @@ -391,11 +391,11 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) /* If the dependany is still not satisfied, try, if possible, unpacking a package to satisfy it */ if (InstallVer != 0 && Bad) { Bad = false; - if (!List->IsFlag(DepPkg,pkgOrderList::Loop)) { + if (List->IsNow(DepPkg) && !List->IsFlag(DepPkg,pkgOrderList::Loop)) { List->Flag(Pkg,pkgOrderList::Loop); if (Debug) cout << " Unpacking " << DepPkg.Name() << " to avoid loop" << endl; - SmartUnPack(DepPkg, false); + SmartUnPack(DepPkg, true); List->RmFlag(Pkg,pkgOrderList::Loop); } } @@ -527,9 +527,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate) clog << "SmartUnPack " << Pkg.Name(); VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer); if (Pkg.CurrentVer() == 0) - cout << "(install version " << InstallVer.VerStr() << ")" << endl; + cout << " (install version " << InstallVer.VerStr() << ")" << endl; else - cout << "(replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")" << endl; + cout << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")" << endl; } // Check if it is already unpacked |