From 6ac77d50d43647dd8df8bd3b3d89f64c48db61f3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Oct 2009 18:48:18 +0200 Subject: backout revno 1875 - as this aggressive immediate propergation is something we want sometimes --- apt-pkg/packagemanager.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index dbcd461ac..e51021b39 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -143,10 +143,6 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned for ( /* nothing */ ; D.end() == false; D++) if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) { - // ignore dependencies if no instal/upgrade/remove is going to happen - if (D.TargetPkg() == 0 || Cache[D.TargetPkg()].Keep()) - continue; - if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate)) { if(Debug) -- cgit v1.2.3 From f66a64c26cb60656255c89fcd4fc757422d9545a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Oct 2009 20:32:55 +0200 Subject: improve the documentation and errormessages regarding a failing immediate configuration as the old message was quite a bit scare and uninformative. --- apt-pkg/packagemanager.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index e51021b39..f75c5b61f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -471,7 +471,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name()); + return _error->Error(_("Could not perform immediate configuration for on already unpacked %s." + "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name()); return true; } @@ -571,7 +572,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) // Perform immedate configuration of the package. if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); + return _error->Error(_("Could not perform immediate configuration on %s." + "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name()); return true; } -- cgit v1.2.3