summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-08 19:36:31 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-08 19:36:31 +0200
commitc15f569038c9d08cfb5186945d9c5095f7776768 (patch)
tree40bb14911bf21af9d4a66fe3b8d6ced900966150
parent9d2938d4e6e86c6afdb9606f76f4ae9ce0ac4ee5 (diff)
* apt-pkg/algorithms.cc:
- bugfix in the InstallProcted() code (preserver the auto-install information) * cmdline/makefile: - install apt-mark as well
-rw-r--r--apt-pkg/algorithms.cc9
-rw-r--r--cmdline/makefile6
2 files changed, 13 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index ac9d3be0b..55f44fbd5 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1229,8 +1229,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);
+ }
}
}
}
diff --git a/cmdline/makefile b/cmdline/makefile
index 882a0e1b5..49035be44 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -52,3 +52,9 @@ SOURCE=apt-key
TO=$(BIN)
TARGET=program
include $(COPY_H)
+
+# The apt-mark program
+SOURCE=apt-mark
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)