|
68 | 68 | ## |
69 | 69 | # @var int LOG_LEVEL |
70 | 70 | # @brief the threshold for displaying logs; higher is quieter |
71 | | -LOG_LEVEL = int(os.getenv("LOGGING", "20")) |
| 71 | +LOG_LEVEL = int(os.getenv("LOG_LEVEL", "20")) |
72 | 72 |
|
73 | 73 | logging.basicConfig(level=LOG_LEVEL) |
74 | 74 |
|
@@ -367,7 +367,7 @@ def add_member_to_team(member_object, team_object): |
367 | 367 | return None |
368 | 368 |
|
369 | 369 | logging.debug("Not in DRY_RUN, so interacting with GitHub API") |
370 | | - return team_object.add_membership(member_name) |
| 370 | + return team_object.add_membership(member_object) |
371 | 371 |
|
372 | 372 |
|
373 | 373 | def remove_member_from_team(member_object, team_object): |
@@ -431,12 +431,16 @@ def main(): |
431 | 431 |
|
432 | 432 | logging.info("%i / %i: %s", member_count, member_total, member) |
433 | 433 |
|
434 | | - if current_team_members[member] and allow_user(member_object) is False: |
| 434 | + if ( |
| 435 | + member in current_team_members |
| 436 | + and current_team_members[member] |
| 437 | + and allow_user(member_object) is False |
| 438 | + ): |
435 | 439 | logging.info( |
436 | 440 | "'%s' is in the team but shouldn't be, so removing them", member |
437 | 441 | ) |
438 | 442 | remove_member_from_team(member_object, team_object) |
439 | | - elif not current_team_members[member] and allow_user(member_object) in ( |
| 443 | + elif member not in current_team_members and allow_user(member_object) in ( |
440 | 444 | None, |
441 | 445 | True, |
442 | 446 | ): |
|
0 commit comments