← Back to branch summary

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

« back to all changes in this revision

Viewing changes to stats.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:
stats.py
32
32
    get_team_packages,
33
33
    OUR_DIST,
34
34
    OUR_DISTRO,
35
 
    read_blacklist,
 
35
    read_blocklist,
36
36
    ROOT,
37
37
    run,
38
38
    SRC_DIST,
138
138
    team = options.team
139
139
    team_package_list = get_team_packages(team)
140
140
    exclude_packages = read_excluded_packages(options.exclude_packages)
141
 
    blacklist = read_blacklist()
 
141
    blocklist = read_blocklist()
142
142
 
143
143
    # For each package in the destination distribution, locate the latest in
144
144
    # the source distribution; calculate the base from the destination
180
180
 
181
181
            stats["total"] += 1
182
182
 
183
 
            if package in blacklist:
184
 
                logging.debug("%s: blacklisted (locally packaged)", package)
 
183
            if package in blocklist:
 
184
                logging.debug("%s: blocklisted (locally packaged)", package)
185
185
                stats["local"] += 1
186
186
                continue
187
187