rda-python-dsquasar 2.0.1__tar.gz → 2.0.2__tar.gz

{rda_python_dsquasar-2.0.1 → rda_python_dsquasar-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 2.0.1
+Version: 2.0.2
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar

{rda_python_dsquasar-2.0.1 → rda_python_dsquasar-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsquasar"
-version = "2.0.1"
+version = "2.0.2"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dsquasar-2.0.1 → rda_python_dsquasar-2.0.2}/src/rda_python_dsquasar/dsquasar.py

@@ -928,7 +928,7 @@ class DsQuasar(PgCMD, PgSplit):
          self.object_copy_local(lfile, ofile, bucket, self.ERRACT)
          cinfo = self.check_local_file(lfile, 32, self.ERRACT)
          if not cinfo: return False
-         info['checksum'] = cinfo['checksum']
+         if 'checksum' in cinfo: info['checksum'] = cinfo['checksum']
          lname = 'OBS'
       else:
          lfile = "{}/{}/".format(chome, dsid)
@@ -939,14 +939,16 @@ class DsQuasar(PgCMD, PgSplit):
          lname = 'DSK'
       record = {}      
       msg = ''
-      checksum = info['checksum']
-      if not pgrec['checksum']:
-         msg = "Checksum misses"
-         record['checksum'] = checksum
-         pgrec['checksum'] = ''
-      elif checksum != pgrec['checksum']:
-         msg = "Checksum mismatch"
-         record['checksum'] = checksum
+      checksum = None
+      if 'checksum' in info:
+         checksum = info['checksum']
+         if not pgrec['checksum']:
+            msg = "Checksum misses"
+            record['checksum'] = checksum
+            pgrec['checksum'] = ''
+         elif checksum != pgrec['checksum']:
+            msg = "Checksum mismatch"
+            record['checksum'] = checksum
       if info['data_size'] != pgrec['data_size']:
          if msg: msg += ", "
          msg += "Size mismatch"
@@ -960,9 +962,11 @@ class DsQuasar(PgCMD, PgSplit):
       if msg:
          msg = "{}-{}-{}: {}".format(dsid, cate.upper(), fname, msg)
          msg += "\n{}:".format(lname)
-         msg += "{}/{}/{}/{}".format(checksum, info['data_size'], info['date_modified'], info['time_modified'])
+         if checksum: msg += "{}/".format(checksum)
+         msg += "{}/{}/{}".format(info['data_size'], info['date_modified'], info['time_modified'])
          msg += "\nDBS:"
-         msg += "{}/{}/{}/{}".format(pgrec['checksum'], pgrec['data_size'], pgrec['date_modified'], pgrec['time_modified'])
+         if checksum: msg += "{}/".format(pgrec['checksum'])
+         msg += "{}/{}/{}".format(pgrec['data_size'], pgrec['date_modified'], pgrec['time_modified'])
          self.pglog(msg, self.LOGACT)
          cid = cate + 'id'
          fcnd = "{} = {}".format(cid, pgrec[cid])

{rda_python_dsquasar-2.0.1 → rda_python_dsquasar-2.0.2}/src/rda_python_dsquasar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dsquasar
-Version: 2.0.1
+Version: 2.0.2
 Summary: RDA Python package to backup and recover RDA data archives to and from GLOBUS Quasar backup server
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsquasar