Просмотр исходного кода

tell the resolver a package is set on hold if it was set by the user
to Keep which happens for example if a user decides to "remove" a not
installed package to forbid that it's part of the solution

David Kalnischkies лет назад: 15
Родитель
Сommit
cbc702ea58
2 измененных файлов с 3 добавлено и 1 удалено
  1. 1 0
      apt-pkg/depcache.h
  2. 2 1
      apt-pkg/edsp.cc

+ 1 - 0
apt-pkg/depcache.h

@@ -232,6 +232,7 @@ class pkgDepCache : protected pkgCache::Namespace
       inline bool NewInstall() const {return Status == 2 && Mode == ModeInstall;};
       inline bool Delete() const {return Mode == ModeDelete;};
       inline bool Keep() const {return Mode == ModeKeep;};
+      inline bool Protect() const {return (iFlags & Protected) == Protected;};
       inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;};
       inline bool Upgradable() const {return Status >= 1;};
       inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};

+ 2 - 1
apt-pkg/edsp.cc

@@ -61,7 +61,8 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
    fprintf(output, "Version: %s\n", Ver.VerStr());
    if (Pkg.CurrentVer() == Ver)
       fprintf(output, "Installed: yes\n");
-   if (Pkg->SelectedState == pkgCache::State::Hold)
+   if (Pkg->SelectedState == pkgCache::State::Hold ||
+       (Cache[Pkg].Keep() == true && Cache[Pkg].Protect() == true))
       fprintf(output, "Hold: yes\n");
    fprintf(output, "APT-ID: %d\n", Ver->ID);
    fprintf(output, "Priority: %s\n", PrioMap[Ver->Priority]);