summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-08-20 23:14:19 +0200
committerJulian Andres Klode <jak@debian.org>2009-08-20 23:14:19 +0200
commitc31fb6542e64a7eb279d0b246da4ea15dc4d6af3 (patch)
treec127564a5e51154f58956a7767f140e2de7a09aa
parent6a094eb0c26f0997e271f6242654293809a4e4a1 (diff)
downloadpython-apt-c31fb6542e64a7eb279d0b246da4ea15dc4d6af3.tar.gz
apt/package.py: Do not mark the package as manually installed on upgrade (Closes: #542699)
-rw-r--r--apt/package.py3
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 2 deletions
diff --git a/apt/package.py b/apt/package.py
index 7322bb94..e33078d8 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -1064,7 +1064,8 @@ class Package(object):
def markUpgrade(self):
"""Mark a package for upgrade."""
if self.isUpgradable:
- self.markInstall()
+ fromUser = not self._pcache._depcache.IsAutoInstalled(self._pkg)
+ self.markInstall(fromUser=fromUser)
else:
# FIXME: we may want to throw a exception here
sys.stderr.write(("MarkUpgrade() called on a non-upgrable pkg: "
diff --git a/debian/changelog b/debian/changelog
index 03f0ad5b..7ab2fda4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ python-apt (0.7.12.2) UNRELEASED; urgency=low
* apt/package.py:
- Introduce Version.get_dependencies() which takes one or more types
of dependencies and returns a list of Dependency objects.
+ - Do not mark the package as manually installed on upgrade (Closes: #542699)
- -- Julian Andres Klode <jak@debian.org> Tue, 18 Aug 2009 13:22:56 +0200
+ -- Julian Andres Klode <jak@debian.org> Thu, 20 Aug 2009 23:13:00 +0200
python-apt (0.7.12.1) unstable; urgency=low