Merge lp://staging/~dobey/software-center/update-13-10 into lp://staging/software-center/stable-13-10
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3310 |
Proposed branch: | lp://staging/~dobey/software-center/update-13-10 |
Merge into: | lp://staging/software-center/stable-13-10 |
Diff against target: |
379 lines (+29/-167) 14 files modified
help/C/index.docbook (+0/-6) help/C/legal.xml (+1/-1) help/C/software-center-C.omf (+0/-30) run-tests.sh (+3/-17) setup.py (+0/-2) softwarecenter/db/pkginfo_impl/packagekit.py (+7/-7) softwarecenter/db/update.py (+4/-2) softwarecenter/ui/gtk3/app.py (+1/-1) softwarecenter/ui/gtk3/aptd_gtk3.py (+0/-1) softwarecenter/ui/gtk3/session/displaystate.py (+5/-5) tests/data/aptroot/etc/apt/sources.list (+3/-3) tests/test_database.py (+1/-2) tests/test_downloader.py (+0/-89) tests/test_pyflakes.py (+4/-1) |
To merge this branch: | bzr merge lp://staging/~dobey/software-center/update-13-10 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina | Approve | ||
Review via email: mp+178829@code.staging.launchpad.net |
Commit message
[Jeremy Bicha]
Adjust help for new yelp system.
Drop obsolete link to alacarte help.
[Rodney Dawes]
Remove bad tests that depend on network.
Fix pyflakes to only run on certain subdirs, and not everything in cwd.
[Iain Lane]
Disable some tests and fix up some others to get them in a passing state.
To post a comment you must log in.
There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.
Persons or Teams:
contributor -agreement- canonical store-developer s
software-
Unaccepted Authors:
Iain Lane <email address hidden>
Iain Lane <email address hidden>