Merge lp:~mterry/mir/dev-unregistered-options into lp:mir

[Robert Carr]

Ignore unknown options instead of aborting.

Ignore unknown options instead of aborting.

This fixes bug 1226227, which is blocking using Mir on the phone because it causes unity8 under autopilot to crash.

Alan G prefers a better long term solution, but seemed open to this as a short term one.

This is the 13.10 development version of https://code.launchpad.net/~mterry/mir/unregistered-options/+merge/188125

[Robert Carr (robertcarr)]

Mergomatic.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~mterry/mir/dev-unregistered-options/+merge/188177/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/mir-ci/1574/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/818
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-armhf-ci/74/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1574/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mterry/mir/dev-unregistered-options/+merge/188177/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/52/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

It's a workaround that will break the expected behaviour in unity-system-compositor but the side effect is not major and unblocking the phone testing seems sufficient. As discussed in bug 1226227 I think this could have been worked around in unity-mir.

=== modified file 'src/server/options/program_option.cpp'
--- src/server/options/program_option.cpp	2013-09-20 18:58:02 +0000
+++ src/server/options/program_option.cpp	2013-09-27 22:01:07 +0000
@@ -36,7 +36,8 @@
     int argc,
     char const* argv[])
 {
-    po::store(po::parse_command_line(argc, argv, desc), options);
+    // TODO: Don't allow unregistered options, once we allow better overriding of option parsing
+    po::store(po::command_line_parser(argc, argv).options(desc).allow_unregistered().run(), options);
     po::notify(options);
 }