[PATCH 2 of 3] update: allow branch crossing when clean

[Martin Geisler]

Adrian Buehlmann <adrian at cadifra.com> writes:

> On 20.08.2009 07:57, Stuart W Marks wrote:
>
>> +    if check and clean:
>> +        raise util.Abort(_("cannot specify both --check and --clean "
>> +                           "at the same time"))
>> +
>
> Maybe the text of the abort message could be a bit shorter. Proposal:
>
> +    if check and clean:
> +        raise util.Abort(_("can't specify both -C and -c"))
> +

No, I think we should keep to full, proper English sentences. I'll have
to write 'kan ikke' (cannot) in Danish anyway since we don't have a word
for the contraction. I also prefer the full option names since I think
they add clarity.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.