From f7f4de5b9198f4f2106ff970dede2b083f39cdf7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 12 Aug 2024 15:36:53 +0200 Subject: [PATCH] Include real name in generated changelog entries Produce entries just like osc vc. --- TarSCM/changes.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/TarSCM/changes.py b/TarSCM/changes.py index 2a92f5a8..bb9560b2 100644 --- a/TarSCM/changes.py +++ b/TarSCM/changes.py @@ -219,14 +219,20 @@ def get_changesauthor(self, args): return args.changesauthor # return changesauthor if set by osc - if os.getenv('VC_MAILADDR'): + realname, mailaddr = os.getenv('VC_REALNAME'), os.getenv('VC_MAILADDR') + if mailaddr and realname: + logging.debug("Found VC_REALNAME='%s' and VC_MAILADDR='%s'", + realname, mailaddr) + return "%s <%s>" % (realname, mailaddr) + + if mailaddr: logging.debug("Found changesauthor in VC_MAILADDR='%s'", - os.environ['VC_MAILADDR']) - return os.environ['VC_MAILADDR'] + mailaddr) + return mailaddr # return default changesauthor if running on server side if os.getenv('OBS_SERVICE_DAEMON'): - logging.debug("Running in daemon mode. Using DEFAULT_AUHTOR='%s'", + logging.debug("Running in daemon mode. Using DEFAULT_AUTHOR='%s'", Cli.DEFAULT_AUTHOR) return Cli.DEFAULT_AUTHOR