Merge lp://staging/~evfool/software-properties/miscfixes2 into lp://staging/software-properties
| Status: | Needs review | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~evfool/software-properties/miscfixes2 | ||||||||||||||||
| Merge into: | lp://staging/software-properties | ||||||||||||||||
| Diff against target: |
455 lines (+143/-105) 7 files modified
add-apt-repository (+67/-59) data/gtkbuilder/dialog-add.ui (+11/-36) softwareproperties/SoftwareProperties.py (+5/-3) softwareproperties/gtk/SoftwarePropertiesGtk.py (+2/-0) softwareproperties/ppa.py (+18/-6) tests/test_aptaddrepo.py (+36/-0) tests/test_lp.py (+4/-1) |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~evfool/software-properties/miscfixes2 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Needs Information | ||
|
Review via email:
|
|||
Description of the change
This branch fixes the following bugs:
- Bug #496879 - returns non-0 result code from add-apt-repository whenever anything goes wrong, PPA can not be found, or signing key can not be found
- Bug #779287 - API url changed to the URL of the pubic API
- Bug #489488 - partially fixes this by adding the PPA display name as deb-line comment, thus the displayname will be shown in software-properties instead of the long and confusing PPA url
- Bug #930624 - add a title (Add) to the add-dialog (instead of the default software-
- Bug #599801 - sort software sources from the other software tab alphabetically by their description, this way we get a more deterministic ordering than the default, thus users will be able to find the source they are looking for faster.
I have also made the following changes:
- removed a duplicated utf8 method(the same method has been declared twice in apt-add-repo),
- added another testcase in testlp to test invalid repo is handled correctly (no PPA info is returned)
- updated the error handling (try .. except HTTPError, URLError statements have been removed) to work with new curl based PPA info fetching (as curl does not throw an exception, but the result code can be queried separately) by only accepting HTTP 200 OK for now, other "partially successful" HTTP response codes should be added as required
- added new testaptaddrepo tests for apt-add-repository sanity checks, to see if adding invalid repo returns non-0 result code and working commands return 0 result codes
| Robert Roth (evfool) wrote | # |
| Robert Roth (evfool) wrote | # |
Unmerged revisions
- 753. By Robert Roth
-
Added apt-root dir CLI parameter for apt-add-repository
- 752. By Robert Roth
-
Merged from mvo's branch
- 751. By Robert Roth
-
Merged from trunk
- 750. By Robert Roth
-
Sort software sources alphabetically by their description (LP: #599801)
- 749. By Robert Roth
-
Fix add source dialog consistency issues (LP: #930624)
- 748. By Robert Roth
-
Also return non-null result code if PPA key validation fails (LP: #496879)
- 747. By Robert Roth
-
Add basic unit test for apt-add-repository
- 746. By Robert Roth
-
Add the display name of a PPA as deb entry comment (LP: #489488)
- 745. By Robert Roth
-
Use public Launchpad API (LP:#779287)
- 744. By Robert Roth
-
Fix error handling in new launchpad info retrieval (LP: #496879)
Thanks! This looks great. I tweaked some minor issues and added a FIXME for the new tests/test_