diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-08 20:11:30 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-08 20:11:30 +0200 |
| commit | de86a3614abf494c73e534c055aabcea3494f0ae (patch) | |
| tree | 038ae0f41885e4650887640288b10d7334e101d4 /apt-pkg | |
| parent | 2ea152b6fb5799f180d4133dc76c52cf1a122f54 (diff) | |
| parent | c15f569038c9d08cfb5186945d9c5095f7776768 (diff) | |
* apt-pkg/algorithms.cc:
- merged from apt--auto-mark (preserve auto-install information in InstallProtect
* cmdline/apt-get.cc:
- fix typo
* cmdline/makefile:
- install apt-mark as well
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/algorithms.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f50c52a32..ddfda754d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1250,8 +1250,13 @@ void pkgProblemResolver::InstallProtect() { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I, false, 0, false); + else + { + // preserver the information if the package was auto + // or manual installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } |