Ubuntu Software Center

Merge lp://staging/~nataliabidart/software-center/fix-977931 into lp://staging/software-center

fix-977931
Merge into trunk

Proposed by Natalia Bidart on 2012-04-17

Status:

Superseded

Proposed branch:

lp://staging/~nataliabidart/software-center/fix-977931

Merge into:

lp://staging/software-center

Diff against target:

1310 lines (+667/-156) (has conflicts)

21 files modified

README (+1/-0)
debian/changelog (+17/-2)
softwarecenter/backend/spawn_helper.py (+3/-0)
softwarecenter/db/__init__.py (+7/-2)
softwarecenter/db/database.py (+4/-0)
softwarecenter/db/debfile.py (+38/-21)
softwarecenter/enums.py (+6/-0)
softwarecenter/testutils.py (+11/-1)
softwarecenter/ui/gtk3/SimpleGtkbuilderApp.py (+2/-1)
softwarecenter/ui/gtk3/app.py (+162/-93)
softwarecenter/ui/gtk3/models/appstore2.py (+1/-0)
softwarecenter/ui/gtk3/session/appmanager.py (+5/-0)
softwarecenter/ui/gtk3/session/viewmanager.py (+5/-0)
softwarecenter/ui/gtk3/views/appdetailsview.py (+2/-2)
softwarecenter/ui/gtk3/widgets/reviews.py (+12/-4)
softwarecenter/ui/gtk3/widgets/videoplayer.py (+5/-1)
test/gtk3/test_app.py (+357/-0)
test/gtk3/test_debfile_view.py (+3/-8)
test/gtk3/test_purchase.py (+8/-12)
test/test_database.py (+8/-3)
test/test_debfileapplication.py (+10/-6)

Text conflict in debian/changelog

To merge this branch:

bzr merge lp://staging/~nataliabidart/software-center/fix-977931

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
software-store-developers		2012-04-17	Pending
Review via email: mp+102321@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2012-05-16.

Commit message

- Unified package string parsing into a single method that will be used from either the command line arguments, or from the dbus method 'bringToFront'. This way, search will be consistent between all entry points.
- Also added proper test suites for the above.

Revision history for this message

Michael Vogt (mvo) wrote on 2012-05-16:

Thanks Natalia for this branch and sorry for my slow reply.

First let me say thanks for the work and the refactor and the excellent test, we shall use that
as a example.

This looks fine, there have been some changes in the 5.2 branch so I merged it and resolved
conflicts and tweaked it a bit more, please remerge lp:~mvo/software-center/fix-977931/ with this branch
and let me know what you think.

I was curious how to reproduce/understand the changes in appview.py, reviews.py that cause the model to
be "None". I revert that change but for me its not crashing so I wonder if that is still needed? Or is it
a random issue? Except for this (which I just would like to understand better how it happens) the branch
is +10 approve ;)

Additional thanks for unifying get_mock_options() and the with open() fix (and the cleanup) in test_database.py.

lp://staging/~nataliabidart/software-center/fix-977931 updated on 2012-05-16

2991. By Natalia Bidart on 2012-05-16

Merged 5.2 in.

* lp:~evfool/software-center/lp987801:
  - Only show the version label once for each version in
    reviews (LP: #987801)
* lp:~mvo/software-center/fix-lp994632:
  - add a dep to ensure we get the correct ubuntu-sso-client-gtk
    (LP: #994632)
* lp:~mvo/software-center/proper-error-on-unknown-files:
  - show a proper error message when attempting to open unknown
    file types (LP: #944868)
* lp:~mvo/software-center/lp921799:
  - fix crash when decoding screenshots JSON (LP: #921799)
* lp:~mvo/software-center/lp959612:
  - fix crash when selecting the Installed view very quickly
    after startup (LP: #959612)

[ Ken VanDine ]
* lp:~ken-vandine/software-center/lp_982567:
- Check if the proxy is enabled, if the proxy host is set but not
enabled we shouldn't attempt to use the proxy (LP: #982567)

[ Gary Lasker ]
* lp:~gary-lasker/software-center/fix-crash-lp969732:
  - need to explicitly declare the needs-refresh signal in the
    AppTreeStore class to prevent a crash (LP: #969732)
* lp:~gary-lasker/software-center/fix-crash-lp870822:
  - don't crash if we don't get a pkgversion object back
    (LP: #870822)
* lp:~gary-lasker/software-center/fix-shutdown-crash-lp996333:
  - never crash when writing out the software center config file on
    shutdown (LP: #996333)
* lp:~gary-lasker/software-center/fix-makedirs-race-crashes:
  - fix crash on race when creating the cache or config directories
    (LP: #743003, LP: #621182)
* lp:~gary-lasker/software-center/fix-crash_lp973379:
  - ensure that the cache is ready before using the recommender
    service (LP: #973379 )
* lp:~gary-lasker/software-center/toolbar-buttons-insensitive-during-startup:
  - set the toolbar buttons insensitive for the duration of time that the
    lobby panels are initializing (LP: #999486, LP: #994341)
[ Robert Roth ]
* lp:~evfool/software-center/bug532072:
  - escape markup for support info and license (LP: #993279)
  - ellipsize summary at trailing end (LP: #532072)
* lp:~evfool/software-center/lp626037:
  - subtle background color tweak for consistency
    between views (LP: #626037)
* lp:~evfool/software-center/lp835005:
  - no need for the software-properties dialog to be modal
    to software-center (LP: #835005)
* lp:~evfool/software-center/lp839389:
  - don't display an "icon not found" image in the Unity
    launcher when a report a review window is opened (LP: #839389)
* lp:~evfool/software-center/867588:
  - capitalize the first letter of the package summary
    (LP: #867588)
* lp:~evfool/software-center/lp876657:
  - make sure the search field does not disappear when an
    install or remove is in progress (LP: #876657)
* lp:~evfool/software-center/lp987797:
  - fix alignment in the reviews part of the appdetails (LP: #987797)
* lp:~evfool/software-center/lp844768:
  - show a indeterminate progress bar when software-center waits for
    another packagemanager to exit (LP: #844768)
[ Dave Morley ]
* lp:~davmor2/software-center/add-performance:
  - test code change only! add memory and cpt stats to the
    test script

2992. By Natalia Bidart on 2012-05-16