diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-15 09:59:12 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-10-15 09:59:12 +0200 |
| commit | 5caefc9115860e1bc1fdff8971a9e45f96a1c4e5 (patch) | |
| tree | 8729bef2dd755e6d6a4236ea66f9982102e77623 /apt-pkg/edsp.cc | |
| parent | e74ff795d39894268c737c4b1864869dadb74ed1 (diff) | |
| parent | 7f18595b3ef9a348719969889097adb4f45d44f0 (diff) | |
merge from lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/edsp.cc')
| -rw-r--r-- | apt-pkg/edsp.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index adb8788b3..6ce9da784 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -214,9 +214,11 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade, if (Progress != NULL && p % 100 == 0) Progress->Progress(p); string* req; - if (Cache[Pkg].Delete() == true) + pkgDepCache::StateCache &P = Cache[Pkg]; + if (P.Delete() == true) req = &del; - else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true) + else if (P.NewInstall() == true || P.Upgrade() == true || P.ReInstall() == true || + (P.Mode == pkgDepCache::ModeKeep && (P.iFlags & pkgDepCache::Protected) == pkgDepCache::Protected)) req = &inst; else continue; |