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

[Git][ftp-team/dak][master] 2 commits: Store the prod mail as note for the package



Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

2 changed files:

Changes:

  • dak/process_new.py
    ... ... @@ -582,7 +582,7 @@ def do_new(upload, upload_copy, handler, session):
    582 582
                     sys.exit(0)
    
    583 583
             elif answer == 'P' and not Options["Trainee"]:
    
    584 584
                 if prod_maintainer(get_new_comments(upload.policy_queue, upload.changes.source, session=session),
    
    585
    -                               upload) == 0:
    
    585
    +                               upload, session, bool(Options["Trainee"])) == 0:
    
    586 586
                     end()
    
    587 587
                     sys.exit(0)
    
    588 588
                 Logger.log(["NEW PROD", upload.changes.changesname])
    

  • daklib/queue.py
    ... ... @@ -83,7 +83,7 @@ def check_valid(overrides, session):
    83 83
     ###############################################################################
    
    84 84
     
    
    85 85
     
    
    86
    -def prod_maintainer(notes, upload):
    
    86
    +def prod_maintainer(notes, upload, session, trainee=False):
    
    87 87
         cnf = Config()
    
    88 88
         changes = upload.changes
    
    89 89
         whitelists = [upload.target_suite.mail_whitelist]
    
    ... ... @@ -133,6 +133,18 @@ def prod_maintainer(notes, upload):
    133 133
     
    
    134 134
         print("Sent prodding message")
    
    135 135
     
    
    136
    +    answer = utils.our_raw_input("Store prod message as note? (Y/n)?").lower()
    
    137
    +    if answer != "n":
    
    138
    +        comment = NewComment()
    
    139
    +        comment.policy_queue = upload.policy_queue
    
    140
    +        comment.package = upload.changes.source
    
    141
    +        comment.version = upload.changes.version
    
    142
    +        comment.comment = prod_mail_message
    
    143
    +        comment.author = utils.whoami()
    
    144
    +        comment.trainee = trainee
    
    145
    +        session.add(comment)
    
    146
    +        session.commit()
    
    147
    +
    
    136 148
     ################################################################################
    
    137 149
     
    
    138 150
     
    


  • Reply to: