From 859bb146dbf4713f51750a6a022eff9e9e72398b Mon Sep 17 00:00:00 2001 From: zaihuaji Date: Mon, 27 Oct 2025 15:19:06 -0500 Subject: [PATCH 1/2] None to '' for ekey --- pyproject.toml | 2 +- src/rda_python_common/PgOPT.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aa92fd1..e1b7895 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "rda_python_common" -version = "1.0.47" +version = "1.0.48" authors = [ { name="Zaihua Ji", email="zji@ucar.edu" }, ] diff --git a/src/rda_python_common/PgOPT.py b/src/rda_python_common/PgOPT.py index 93acba3..5794e1b 100644 --- a/src/rda_python_common/PgOPT.py +++ b/src/rda_python_common/PgOPT.py @@ -1683,9 +1683,16 @@ def send_request_email_notice(pgrqst, errmsg, fcount, rstat, readyfile = None, p for ekey in einfo: if ekey == 'CCD' and not einfo['CCD']: - ebuf = re.sub(r'Cc:\s*\s*', '', ebuf) + mp = r'Cc:\s*\s*' + rep = '' else: - ebuf = re.sub(r'<{}>'.format(ekey), einfo[ekey], ebuf) + mp = r'<{}>'.format(ekey) + rep = einfo[ekey] + if rep is None: + PgLOG.pglog("{}.{}: None ekey value for reuqest email".format(pgrqst['rindex'], ekey), + PGOPT['wrnlog']|PgLOG.FRCLOG) + rep = '' + ebuf = re.sub(mp, rep, ebuf) if PgLOG.PGLOG['DSCHECK'] and not pgpart: tbl = "dscheck" From 927d095602ef77c62007ea7051fec85a0a7b35cd Mon Sep 17 00:00:00 2001 From: zaihuaji Date: Tue, 28 Oct 2025 14:47:46 -0500 Subject: [PATCH 2/2] v1.0.49 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e1b7895..3fa0fe0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "rda_python_common" -version = "1.0.48" +version = "1.0.49" authors = [ { name="Zaihua Ji", email="zji@ucar.edu" }, ]