diff options
Diffstat (limited to 'bugzilla_update_user_header.py')
| -rwxr-xr-x | bugzilla_update_user_header.py | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/bugzilla_update_user_header.py b/bugzilla_update_user_header.py index deba274..b079e15 100755 --- a/bugzilla_update_user_header.py +++ b/bugzilla_update_user_header.py @@ -122,24 +122,6 @@ def get_user_histories(verified): pmig.close() return [util.translate_json_dict_items(d) for d in histories] -def get_verified_users(modtime, limit=None): - #Find the task in new Phabricator that matches our lookup - verified = phabdb.get_verified_emails(modtime=modtime, limit=limit) - create_times = [v[2] for v in verified] - try: - newest = max(create_times) - except ValueError: - newest = modtime - return verified, newest - -def get_verified_user(email): - phid, email, is_verified = phabdb.get_user_email_info(email) - log("Single specified user: %s, %s, %s" % (phid, email, is_verified)) - if is_verified: - return [(phid, email)] - else: - log("%s is not a verified email" % (email,)) - return [()] def main(): parser = argparse.ArgumentParser(description='Updates user header metadata from bugzilla') @@ -155,13 +137,13 @@ def main(): if args.a: starting_epoch = phabdb.get_user_relations_last_finish(pmig) - users, finish_epoch = get_verified_users(starting_epoch, config.fab_limit) + users, finish_epoch = phabdb.get_verified_users(starting_epoch, config.fab_limit) elif args.email: - users = get_verified_user(args.email) + users = phabdb.get_verified_user(args.email) starting_epoch = 0 finish_epoch = 0 elif args.starting_epoch: - users, finish_epoch = get_verified_users(args.starting_epoch) + users, finish_epoch = phabdb.get_verified_users(args.starting_epoch) starting_epoch = args.starting_epoch else: parser.print_help() @@ -190,9 +172,11 @@ def main(): log("Issue Count %s" % (str(issue_count))) pid = os.getpid() + source = util.source_name(sys.argv[0]) phabdb.user_relations_start(pid, + source, int(time.time()), - 0, + ipriority['na'], starting_epoch, user_count, issue_count, pmig) @@ -210,6 +194,8 @@ def main(): failed, pmig) pmig.close() + pm = phabmacros(config.phab_user, config.phab_cert, config.phab_host) + vlog(util.update_blog(source, complete, failed, user_count, issue_count, pm)) print '%s completed %s, failed %s' % (sys.argv[0], complete, failed) if __name__ == '__main__': |