rda-python-common 1.0.49__py3-none-any.whl → 1.0.51__py3-none-any.whl

rda_python_common/PgLOG.py

@@ -1349,12 +1349,12 @@ def set_common_pglog():
    SETPGLOG("DSSWEB",  PGLOG['LOCDATA']+"/web")
    SETPGLOG("DSWHOME", PGLOG['DSSWEB']+"/datasets")     # datast web root path
    PGLOG['HOMEROOTS'] = "{}|{}".format(PGLOG['DSSHOME'], PGLOG['DSWHOME'])
-   SETPGLOG("DSSDATA", "/glade/campaign/collections/gdex")                     # dss data root path
+   SETPGLOG("DSSDATA", "/glade/campaign/collections/gdex")  # dss data root path
    SETPGLOG("DSDHOME", PGLOG['DSSDATA']+"/data")        # dataset data root path
    SETPGLOG("DECSHOME", PGLOG['DSSDATA']+"/decsdata")   # dataset decsdata root path
    SETPGLOG("DSHHOME", PGLOG['DECSHOME']+"/helpfiles")  # dataset help root path
    SETPGLOG("UPDTWKP", PGLOG['DSSDATA']+"/work")        # dsupdt work root path
-   SETPGLOG("TRANSFER", PGLOG['DSSDATA']+"/transfer")   # dss transfer partition
+   SETPGLOG("TRANSFER", "/lustre/desc1/gdex/transfer")   # dss transfer partition
    SETPGLOG("RQSTHOME", PGLOG['TRANSFER']+"/dsrqst")    # dsrqst home
    SETPGLOG("DSAHOME",  "")                    # dataset data alternate root path
    SETPGLOG("RQSTALTH", "")                   # alternate dsrqst path

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*<CCD>\s*', '', ebuf)
+         mp = r'Cc:\s*<CCD>\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"

{rda_python_common-1.0.49.dist-info → rda_python_common-1.0.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.49
+Version: 1.0.51
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-1.0.49.dist-info → rda_python_common-1.0.51.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
 rda_python_common/PgDBI.py,sha256=nAov-B-B9XZ7p7rX1ZU4TcjAItSXVq18yD0Xe80TkwY,74962
 rda_python_common/PgFile.py,sha256=obl9Pj3yFnjrOJUTFiEHK7ZbG2Ic_m3dT0NqO7rGvOs,99370
-rda_python_common/PgLOG.py,sha256=RLcsUzHjPqkaoT_jJStG6PoUJzUe5i3NJ8T_bmFhAZA,55387
+rda_python_common/PgLOG.py,sha256=mnS983S-YdJTITnPOdHLC8NgQYueMU0dAFr_5Ouu-Y4,55369
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
-rda_python_common/PgOPT.py,sha256=7eqERFMz2gkKIgHucjwxgBFE9mQ_mUsy_OlUqHyAHrw,56014
+rda_python_common/PgOPT.py,sha256=Kn4JYezZhZwAn2usiIYHoHiymGHRgsN299dxyXbKwkI,56244
 rda_python_common/PgSIG.py,sha256=t0yF2vnLgb6TKEBwIp7pEemvp-N29tjkLMoPETKgiZo,35797
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.49.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.49.dist-info/METADATA,sha256=buXrFXMfaOMJ0eOCoJfNPzDLtVCPYinPU5F2uMn9avo,716
-rda_python_common-1.0.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.49.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.49.dist-info/RECORD,,
+rda_python_common-1.0.51.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.51.dist-info/METADATA,sha256=-Vsmtbpoul4ZJ76F5dDsdMI7z3npGFviAcSBFPN3Q6g,716
+rda_python_common-1.0.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.51.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.51.dist-info/RECORD,,