Merge lp:~mvo/software-center/lp780812 into lp:software-center
Proposed by
Michael Vogt
Status: | Merged |
---|---|
Merged at revision: | 2871 |
Proposed branch: | lp:~mvo/software-center/lp780812 |
Merge into: | lp:software-center |
Diff against target: |
61 lines (+12/-9) 3 files modified
softwarecenter/db/update.py (+6/-4) softwarecenter/ui/gtk3/models/appstore2.py (+3/-2) test/test_reinstall_purchased.py (+3/-3) |
To merge this branch: | bzr merge lp:~mvo/software-center/lp780812 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gary Lasker (community) | Approve | ||
Review via email: mp+97836@code.launchpad.net |
Description of the change
This fixes the bug that for "reinstall-
distro series. It updates the test as well.
There is a small drive-by-fix in there too that I noticed while working on the code. If a package is
in the cache but no longer available (in my case monster-rpg2) its displayed in the listview with a
"install" button because the code only checks for the availalbility of it in the cache.
To post a comment you must log in.
Hi Michael. I'm getting a test failure, and I think this one test in test_reinstall_ purchased. py simply needs to have its expected results updated because we now properly update to the current distro series. I'll wait for you to take a double-check to make sure this is the case. Other than that, this one looks ready for merge! Thanks!
PYTHONPATH=. python test_reinstall_ purchased. py ....... ....DEBUG: softwarecenter. db.update: indexing app 'Photobomb (already purchased)' enter.db. update: WEIGHT WEIGHT_ DESKTOP_ X-APPINSTALL- DESCRIPTION not found ======= ======= ======= ======= ======= ======= ======= ======= ======= purchased_ xapian (__main_ _.TestPurchased ) ------- ------- ------- ------- ------- ------- ------- ------- ------- _purchased. py", line 146, in test_reinstall_ purchased_ xapian /username: random3atoken@" /username:<email address hidden> /commercial- ppa-uploaders/ photobomb/ ubuntu precise main' != 'deb https:/ /username:<email address hidden> /commercial- ppa-uploaders/ photobomb/ ubuntu natty main'
.......
DEBUG:softwarec
F
=======
FAIL: test_reinstall_
-------
Traceback (most recent call last):
File "test_reinstall
"deb https:/
AssertionError: 'deb https:/
------- ------- ------- ------- ------- ------- ------- ------- ------- -------
Ran 19 tests in 2.839s
FAILED (failures=1)