← Back to branch summary

~ubuntu-core-dev/merge-o-matic/trunk

« back to all changes in this revision

Viewing changes to merge-status.py

  • Committer: Simon Quigley
  • Date: 2023-07-26 20:35:00 UTC
  • Revision ID: tsimonq2@ubuntu.com-20230726203500-d62zrnqp4x51vty0
Use sed to move everything from blacklist to blocklist, per recent mailing list discussions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge-status.py
44
44
    OUR_DISTRO,
45
45
    pathhash,
46
46
    proposed_package_version,
47
 
    read_blacklist,
 
47
    read_blocklist,
48
48
    read_report,
49
49
    remove_old_comments,
50
50
    result_dir,
121
121
    our_distro = options.dest_distro
122
122
    our_dist = options.dest_suite
123
123
 
124
 
    blacklist = read_blacklist()
 
124
    blocklist = read_blocklist()
125
125
 
126
126
    outstanding = []
127
127
    if os.path.isfile("%s/outstanding-merges.txt" % ROOT):
146
146
        merges = []
147
147
 
148
148
        for source in get_sources(our_distro, our_dist, our_component):
149
 
            if source["Package"] in blacklist:
 
149
            if source["Package"] in blocklist:
150
150
                continue
151
151
            try:
152
152
                output_dir = result_dir(source["Package"])