|
|
@@ -550,16 +550,6 @@ void pkgDPkgPM::ProcessDpkgStatusLine(char *line)
|
|
|
{
|
|
|
pkgname = APT::String::Strip(list[2]);
|
|
|
action = APT::String::Strip(list[1]);
|
|
|
-
|
|
|
- // this is what we support in the processing stage
|
|
|
- if(action != "install" && action != "configure" &&
|
|
|
- action != "remove" && action != "purge" && action != "purge")
|
|
|
- {
|
|
|
- if (Debug == true)
|
|
|
- std::clog << "ignoring processing action: '" << action
|
|
|
- << "'" << std::endl;
|
|
|
- return;
|
|
|
- }
|
|
|
}
|
|
|
// "status" has the form: "status: pkg: state"
|
|
|
// with state in ["half-installed", "unpacked", "half-configured",
|
|
|
@@ -696,6 +686,7 @@ void pkgDPkgPM::handleDisappearAction(string const &pkgname)
|
|
|
pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname);
|
|
|
if (unlikely(Pkg.end() == true))
|
|
|
return;
|
|
|
+
|
|
|
// the disappeared package was auto-installed - nothing to do
|
|
|
if ((Cache[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
|
|
|
return;
|
|
|
@@ -1218,7 +1209,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
|
|
|
{
|
|
|
if((*I).Pkg.end() == true)
|
|
|
continue;
|
|
|
- if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
|
|
|
+ if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.FullName()) != disappearedPkgs.end())
|
|
|
continue;
|
|
|
// We keep this here to allow "smooth" transitions from e.g. multiarch dpkg/ubuntu to dpkg/debian
|
|
|
if (dpkgMultiArch == false && (I->Pkg.Arch() == nativeArch ||
|