Merge lp:~mvo/software-center/lp976525 into lp:software-center

Proposed by Michael Vogt on 2012-04-13
Status: Merged
Merged at revision: 2973
Proposed branch: lp:~mvo/software-center/lp976525
Merge into: lp:software-center
Diff against target: 16 lines (+4/-2)
1 file modified
softwarecenter/db/application.py (+4/-2)
To merge this branch: bzr merge lp:~mvo/software-center/lp976525
Reviewer Review Type Date Requested Status
Gary Lasker (community) 2012-04-13 Approve on 2012-04-13
Review via email: mp+101905@code.launchpad.net

Description of the change

Remove the upgrade button again as it means we can't remove apps that are upgradable. LP: #976525

To post a comment you must log in.
Gary Lasker (gary-lasker) wrote :

Small and sweet! This is another really nice one to have fixed for LTS. Many thanks, mvo!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/db/application.py'
2--- softwarecenter/db/application.py 2012-03-20 08:40:10 +0000
3+++ softwarecenter/db/application.py 2012-04-13 12:43:20 +0000
4@@ -482,8 +482,10 @@
5 for origin in self._pkg.installed.origins]
6 if not self._app.archive_suite in archive_suites:
7 return PkgStates.FORCE_VERSION
8- if self._pkg.installed and self._pkg.is_upgradable:
9- return PkgStates.UPGRADABLE
10+ # Don't handle upgrades yet, see bug LP #976525 we need more UI
11+ # for this
12+ #if self._pkg.installed and self._pkg.is_upgradable:
13+ # return PkgStates.UPGRADABLE
14 if self._pkg.is_installed:
15 return PkgStates.INSTALLED
16 else:

Subscribers

People subscribed via source and target branches