Merge lp:~mir-team/mir/fix-1661163 into lp:mir
| Status: | Merged |
|---|---|
| Approved by: | Alan Griffiths on 2017-02-09 |
| Approved revision: | 4013 |
| Merged at revision: | 4020 |
| Proposed branch: | lp:~mir-team/mir/fix-1661163 |
| Merge into: | lp:mir |
| Diff against target: |
40 lines (+3/-5) 3 files modified
include/client/mir_toolkit/mir_display_configuration.h (+2/-1) src/client/display_configuration_api.cpp (+1/-1) src/utils/out.c (+0/-3) |
| To merge this branch: | bzr merge lp:~mir-team/mir/fix-1661163 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir CI Bot | continuous-integration | Approve on 2017-02-09 | |
| Alan Griffiths | Approve on 2017-02-09 | ||
| Chris Halse Rogers | Approve on 2017-02-09 | ||
| Kevin DuBois (community) | 2017-02-03 | Approve on 2017-02-08 | |
|
Review via email:
|
|||
Commit Message
Fix crash when zero cards are in the display config (nested server).
And deprecate the offending function because it's probably not useful to
keep (or to write tests for). (LP: #1661163)
| Chris Halse Rogers (raof) wrote : | # |
So, the deprecation comment is incorrect; the information provided by get_max_
I don't mind deprecating it, but the reason that I don't mind it being deprecated is that it's difficult for a client to make use of this information.
Or, rather, it's easy to make use of - a client can definitely know up front that a configuration with more outputs enabled will fail - but that doesn't tell a client how to set up a configuration with that many outputs enabled (which will often have quite significant restrictions).
I'm not entirely sure how to make the latter happen.
| Daniel van Vugt (vanvugt) wrote : | # |
OK then. Land it, then clarify the comment, then decided whether to un-deprecate in future.
| Daniel van Vugt (vanvugt) wrote : | # |
I have now clarified the comment.
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1616312
but that was also probably trying to land the wrong revision.
- 4013. By Daniel van Vugt on 2017-02-09
-
Clarify deprecation comment even better.
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4012
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4013
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:4009
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/