Respect admin merge flag (#27)

--- fel-pr: 27 fel-branch: fel/zabot/27
Zabot · Jun 3, 2021 · d9638f5 · d9638f5
1 parent 99cfdb0
commit d9638f5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fel/land.py b/fel/land.py
@@ -40,7 +40,7 @@ def land(repo, commit, gh_repo, upstream, branch_prefix, admin_merge=False, wait
  if wait and wait_for_merge:
  mergeable, status = wait_for_checks(gh_repo, pr, upstream.name)
 
- if not mergeable:
+ if not mergeable and not admin_merge:
  logging.error("Merge is blocked, run with --admin to force merge: %s", status)
  raise SystemExit()