Merge lp://staging/~mvo/software-center/expunge-cache-5.0 into lp://staging/software-center
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~mvo/software-center/expunge-cache-5.0 |
| Merge into: | lp://staging/software-center |
| Diff against target: |
1104 lines (+786/-86) (has conflicts) 13 files modified
debian/changelog (+42/-2) softwarecenter/backend/scagent.py (+7/-0) softwarecenter/db/update.py (+163/-0) softwarecenter/ui/gtk3/app.py (+30/-0) softwarecenter/ui/gtk3/panes/availablepane.py (+12/-3) softwarecenter/ui/gtk3/panes/installedpane.py (+17/-0) softwarecenter/ui/gtk3/panes/softwarepane.py (+90/-1) softwarecenter/ui/gtk3/views/purchaseview.py (+17/-0) softwarecenter/ui/gtk3/widgets/buttons.py (+5/-0) test/test_database.py (+4/-0) test/test_utils.py (+39/-0) utils/expunge-cache.py (+166/-80) utils/piston-helpers/piston_get_scagent_available_apps.py.OTHER (+194/-0) Text conflict in debian/changelog Text conflict in softwarecenter/backend/scagent.py Text conflict in softwarecenter/db/update.py Text conflict in softwarecenter/ui/gtk3/app.py Text conflict in softwarecenter/ui/gtk3/panes/availablepane.py Text conflict in softwarecenter/ui/gtk3/panes/installedpane.py Text conflict in softwarecenter/ui/gtk3/panes/softwarepane.py Text conflict in softwarecenter/ui/gtk3/views/purchaseview.py Text conflict in softwarecenter/ui/gtk3/widgets/buttons.py Text conflict in test/test_database.py Text conflict in utils/expunge-cache.py Contents conflict in utils/piston-helpers/piston_get_scagent_available_apps.py |
| To merge this branch: | bzr merge lp://staging/~mvo/software-center/expunge-cache-5.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gary Lasker (community) | Approve | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-03-06.
Description of the change
Trivial addition to be more gently on the CPU with os.nice()
Unmerged revisions
- 2491. By Michael Vogt
-
add os.nice()
- 2490. By Michael Vogt
-
merged expunge-cache branch for 5.0
- 2489. By Gary Lasker
-
testing (LP: #918746)
- 2488. By Michael Vogt
-
* lp:~gary-lasker/software-center/staging-certs-2-for-5.0:
- add SOFTWARE_CENTER_ FORCE_DISABLE_ CERTS_CHECK to allow QA easier
testing - 2487. By Michael Vogt
-
grab exhibits for the current series only (LP: #899257)
- 2486. By Michael Vogt
-
* lp:~mvo/software-center/fix-server-pagination:
- reset server side review "page" when switching to a different
app - 2485. By Michael Vogt
-
* lp:~gary-lasker/software-center/fix-lp913756-for-5.0:
- do not offer to add an icon to the Unity launcher for packages
that do not have an Exec entry in their corresponding desktop
file, e.g. ubuntu-restricted- extras, wine (LP: #913756) - 2484. By Michael Vogt
-
releasing version 5.0.4
- 2483. By Gary Lasker
-
download icons directly using the provided URL (LP: #914054)
- 2482. By Michael Vogt
-
test fixes
Just a note that I merged the lp:~mvo/software-center/expunge-cache branch, which is the one targeting trunk. Thanks!