Merge lp://qastaging/~evfool/update-manager/fixlp823935 into lp://qastaging/update-manager
Proposed by
Robert Roth
| Status: | Merged |
|---|---|
| Merged at revision: | 2208 |
| Proposed branch: | lp://qastaging/~evfool/update-manager/fixlp823935 |
| Merge into: | lp://qastaging/update-manager |
| Diff against target: |
25 lines (+2/-2) 2 files modified
UpdateManager/UnitySupport.py (+1/-1) tests/test_changelog.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~evfool/update-manager/fixlp823935 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Description of the change
The changes in this branch are the following:
* fixes a test from test_changelog, broken since revisio 2122, when the wording of the text we check for in the test has been changed.
* fixes bug #823935, causing update-manager to crash when the user does not have gir1.2-unity-3.0 installed, instead of running without unitysupport, as the UnitySupport class used when the user does not have the Unity GI installed did not have the UnitySupport() __init__()'s second argument default to None, so just added a None default value to the IUnitySupport __init__() method's second argument.
[1] http://
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
