← Back to branch summary

~andol/duplicity/signkeyformat

« back to all changes in this revision

Viewing changes to duplicity/commandline.py

  • Committer: Andreas Olsson
  • Date: 2014-10-27 22:31:58 UTC
  • Revision ID: andreas@arrakis.se-20141027223158-hcsrc4jmpz934yuf
https://launchpad.net/bugs/910719
Allow --sign-key to use short format, long format alt. full fingerprint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/commandline.py
900
900
 
901
901
def set_sign_key(sign_key):
902
902
    """Set globals.sign_key assuming proper key given"""
903
 
    if not len(sign_key) == 8 or not re.search("^[0-9A-F]*$", sign_key):
904
 
        log.FatalError(_("Sign key should be an 8 character hex string, like "
 
903
    if not re.search("^(0x)?([0-9A-Fa-f]{8}|[0-9A-Fa-f]{16}|[0-9A-Fa-f]{40})$", sign_key):
 
904
        log.FatalError(_("Sign key should be an 8, 16 alt. 40 character hex string, like "
905
905
                         "'AA0E73D2'.\nReceived '%s' instead.") % (sign_key,),
906
906
                       log.ErrorCode.bad_sign_key)
907
907
    globals.gpg_profile.sign_key = sign_key