Merge lp://staging/~tribaal/landscape-client/1434546-wrong-exit-code-on-error into lp://staging/~landscape/landscape-client/trunk

+1 with minor comments

This branch is fine as-is. I did have a thought about how it could be better:

Looking at the new report_registration_outcome(), it seems to me that it is now two functions interleaved together. There is (almost) no shared code between reporting the outcome to the user and ending the program with an appropriate exit code. Perhaps a new function would be better, something like:

def determine_exit_code(what_happened):
    if what_happened == 'success':
        return 2
    else:
        return 0

Then the line "sys.exit(dermine_exit_code(what_happened))" can be added just after the call to report_registration_outcome().

This benefits the code by making the tests more straight forward (no changes are needed to existing tests, allowing them to remain focused on only one thing, the new tests will be similarly focused). Additionally, the code will be easier to understand (the question "what determines the exit code" can be answered by reading less code than previously).

What do you think?

So, I think your approach is more elegant, so I rewrote this branch here: https://code.launchpad.net/~tribaal/landscape-client/take-two-1434546-exit-code-2-on-error

I'll close this merge proposal and resubmit the new one.