diff options
| -rw-r--r-- | apt/package.py | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apt/package.py b/apt/package.py index f5aa5237..04d4dddd 100644 --- a/apt/package.py +++ b/apt/package.py @@ -1109,11 +1109,12 @@ class Package(object): fixer.resolve(True) self._pcache.cache_post_change() - def mark_upgrade(self): + def mark_upgrade(self, from_user=True): """Mark a package for upgrade.""" if self.is_upgradable: - from_user = not self._pcache._depcache.is_auto_installed(self._pkg) + auto = self.is_auto_installed self.mark_install(from_user=from_user) + self.mark_auto(auto) 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 44bf70c9..39306d8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ python-apt (0.9.0) UNRELEASED; urgency=low [ Jakub Wilk ] * python-apt: formatting error in library/index.rst (Closes: #692484) + [ Daniel Hartwig ] + * apt/package.py: + - mark_upgrade misuses FromUser to set auto-installed (Closes: #686726) + -- Michael Vogt <mvo@debian.org> Mon, 05 Aug 2013 22:55:02 +0200 python-apt (0.8.9.1) unstable; urgency=low |