rda-python-common 1.0.44__py3-none-any.whl → 1.0.46__py3-none-any.whl

rda_python_common/PgFile.py

@@ -1664,7 +1664,7 @@ def local_file_stat(file, fstat, opt, logact):
    if opt&8:
       info['gid'] = fstat.st_gid
       info['group'] = grp.getgrgid(info['gid']).gr_name
-   if opt&32: info['checksum'] = get_md5sum(file, 0, logact)
+   if opt&32 and info['isfile']: info['checksum'] = get_md5sum(file, 0, logact)
 
    return info
 
@@ -2305,16 +2305,18 @@ def get_md5sum(file, count = 0, logact = 0):
    if count > 0:
       checksum = [None]*count
       for i in range(count):
-         chksm = PgLOG.pgsystem(cmd + file[i], logact, 20)
-         if chksm:
-            ms = re.search(r'(\w{32})', chksm)
-            if ms: checksum[i] = ms.group(1)
+         if op.isfile(file[i]):
+            chksm = PgLOG.pgsystem(cmd + file[i], logact, 20)
+            if chksm:
+               ms = re.search(r'(\w{32})', chksm)
+               if ms: checksum[i] = ms.group(1)
    else:
-      chksm = PgLOG.pgsystem(cmd + file, logact, 20)
       checksum = None
-      if chksm:
-         ms = re.search(r'(\w{32})', chksm)
-         if ms: checksum = ms.group(1)
+      if op.isfile(file):
+         chksm = PgLOG.pgsystem(cmd + file, logact, 20)
+         if chksm:
+            ms = re.search(r'(\w{32})', chksm)
+            if ms: checksum = ms.group(1)
 
    return checksum
 

rda_python_common/PgLOG.py

@@ -354,9 +354,12 @@ def log_email(emlmsg):
    if not CPID['PID']: CPID['PID'] =  "{}-{}-{}".format(PGLOG['HOSTNAME'], get_command(), PGLOG['CURUID'])
    cmdstr = "{} {} at {}\n".format(CPID['PID'], break_long_string(CPID['CMD'], 40, "...", 1), current_datetime())
    fn = "{}/{}".format(PGLOG['LOGPATH'], PGLOG['EMLFILE'])
-   f = open(fn, 'a')
-   f.write(cmdstr + emlmsg)
-   f.close()
+   try:
+      f = open(fn, 'a')
+      f.write(cmdstr + emlmsg)
+      f.close()
+   except FileNotFoundError as e:
+       print(e)
 
 #
 # Function: cmdlog(cmdline)
@@ -474,7 +477,7 @@ def write_message(msg, file, logact):
       if logact&BRKLIN: OUT.write("\n")
       if logact&SEPLIN: OUT.write(PGLOG['SEPLINE'])
    OUT.write(msg)
-   if errlog and not logact&(EMLALL|SKPTRC): OUT.write(get_call_trace())
+   if errlog and file and not logact&(EMLALL|SKPTRC): OUT.write(get_call_trace())
    if doclose: OUT.close()
 
 #

{rda_python_common-1.0.44.dist-info → rda_python_common-1.0.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.44
+Version: 1.0.46
 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.44.dist-info → rda_python_common-1.0.46.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=yAYpk_U3xGKwrGQXhM7Zy9bvyV-tCwCrYr1OSNcX2Pw,98905
-rda_python_common/PgLOG.py,sha256=5Ac9DydzJbZSzoOseQWw4trEUAI4sWXblDpYWCkouPo,55449
+rda_python_common/PgFile.py,sha256=CJqMlUzR47JkTRBsAWwfY-Fl_3IED-u5HuR19EtdDuo,99006
+rda_python_common/PgLOG.py,sha256=KK90AHYssRCeqa2swphhuTdnPeSOMUc8ylwFJe1Bi8c,55525
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=Q0e5dhfhOw8ha7y28s3SS8xBk_kdHSWjC8JfC--2rvU,56012
 rda_python_common/PgSIG.py,sha256=ZVM9Qz6yIFurwIQJtV5-CFbKOTdFsZ-Rs95SEpDFgNk,35795
 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.44.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.44.dist-info/METADATA,sha256=zPzyedrVtoTcpAxvcDR_znVIZmOk2XK7kKAwSjuR3Nk,716
-rda_python_common-1.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.44.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.44.dist-info/RECORD,,
+rda_python_common-1.0.46.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.46.dist-info/METADATA,sha256=YCP0-JU_eA01fHYBpWsatyCeOT-T_Sw6wGnoXe9iosY,716
+rda_python_common-1.0.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.46.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.46.dist-info/RECORD,,