[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] send_mail: pass additional options for GnuPG to `sign_mail`



Title: GitLab

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

  • 2e25638c
    by Ansgar at 2022-08-27T21:25:55+02:00
    send_mail: pass additional options for GnuPG to `sign_mail`
    

1 changed file:

Changes:

  • daklib/utils.py
    ... ... @@ -400,7 +400,14 @@ def send_mail(message, whitelists=None):
    400 400
         # sign mail
    
    401 401
         mailkey = Cnf.get('Dinstall::Mail-Signature-Key', '')
    
    402 402
         if mailkey:
    
    403
    -        msg = daklib.mail.sign_mail(msg, keyids=[mailkey])
    
    403
    +        kwargs = {
    
    404
    +            'keyids': [mailkey],
    
    405
    +            'pubring': cnf.get('Dinstall::SigningPubKeyring') or None,
    
    406
    +            'secring': cnf.get('Dinstall::SigningKeyring') or None,
    
    407
    +            'homedir': cnf.get('Dinstall::SigningHomedir') or None,
    
    408
    +            'passphrase_file': cnf.get('Dinstall::SigningPassphraseFile') or None,
    
    409
    +        }
    
    410
    +        msg = daklib.mail.sign_mail(msg, **kwargs)
    
    404 411
     
    
    405 412
         msg_bytes = msg.as_bytes(policy=email.policy.default)
    
    406 413
     
    


  • Reply to: