rda-python-common 1.0.15__py3-none-any.whl → 1.0.17__py3-none-any.whl

rda_python_common/PgDBI.py

@@ -236,7 +236,6 @@ def set_dbname(scname = None, lnname = None, pwname = None, dbhost = None, dbpor
 #
 def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhost = None, dbport = None, socket = None):
 
-   global pgdb
    changed = 0
 
    if dbname and dbname != PGDBI['DBNAME']:
@@ -274,7 +273,6 @@ def set_scname(dbname = None, scname = None, lnname = None, pwname = None, dbhos
 def starttran():
 
    global curtran
-   global pgdb
 
    if curtran == 1: endtran()   # try to end previous transaction
    if not pgdb:
@@ -296,7 +294,6 @@ def starttran():
 def endtran(autocommit = True):
 
    global curtran
-   global pgdb
    if curtran and pgdb:
       if not pgdb.closed: pgdb.commit()
       pgdb.autocommit = autocommit
@@ -308,7 +305,6 @@ def endtran(autocommit = True):
 def aborttran(autocommit = True):
 
    global curtran
-   global pgdb
    if curtran and pgdb:
       if not pgdb.closed: pgdb.rollback()
       pgdb.autocommit = autocommit
@@ -535,7 +531,6 @@ def pgconnect(reconnect = 0, pgcnt = 0, autocommit = True):
 #
 def pgcursor():
 
-   global pgdb
    pgcur = None
 
    if not pgdb:

rda_python_common/PgFile.py

@@ -1125,7 +1125,8 @@ def make_one_remote_directory(dir, odir, host, logact = 0):
    if is_root_directory(dir, 'R', host, "make directory {} on {}".format(odir, host), logact): return PgLOG.FAILURE
  
    if make_one_remote_directory(op.dirname(dir), odir, host, logact):
-      if PgLOG.pgsystem("{} {} {}".format(PgLOG.get_sync_command(host), PgLOG.PGLOG['TMPSYNC'], dir), logact, 5):
+      tmpsync = PgLOG.get_tmpsync_path()
+      if PgLOG.pgsystem("{} {} {}".format(PgLOG.get_sync_command(host), tmpsync, dir), logact, 5):
          set_remote_mode(dir, 0, host, PgLOG.PGLOG['EXECMODE'])
          return PgLOG.SUCCESS
    

rda_python_common/PgLOG.py

@@ -564,7 +564,7 @@ def set_help_path(progfile):
 #
 def show_usage(progname, opts = None):
 
-   if PGLOG['PUSGDIR'] is None: set_help_path(get_caller_file())
+   if PGLOG['PUSGDIR'] is None: set_help_path(get_caller_file(1))
    usgname = join_paths(PGLOG['PUSGDIR'], progname + '.usg')
 
    if opts:
@@ -1337,11 +1337,18 @@ def set_common_pglog():
 
    # empty diretory for HOST-sync
    PGLOG['TMPSYNC'] = PGLOG['DSSDBHM'] + "/tmp/.syncdir" 
+
+   os.umask(2)
+
+#
+# check and return TMPSYNC path, and add it if not exists
+#
+def get_tmpsync_path():
+
    if 'DSSHOME' in PGLOG and PGLOG['DSSHOME'] and not op.exists(PGLOG['TMPSYNC']):
       pgsystem("mkdir " + PGLOG['TMPSYNC'], 0, LGWNEX, 4)
       pgsystem("chmod 775 " + PGLOG['TMPSYNC'], LOGWRN, 4)
-
-   os.umask(2)
+   return PGLOG['TMPSYNC']
 
 #
 # append or prepend locpath to pgpath

{rda_python_common-1.0.15.dist-info → rda_python_common-1.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.15
+Version: 1.0.17
 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.15.dist-info → rda_python_common-1.0.17.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=dsFL_hiAHRZ-BwncgZhxQ7p9O10ox9lUSXOIePjZ-PQ,20487
-rda_python_common/PgDBI.py,sha256=kDawKAKDYr8jLWl1RAS-6fbZOPrLv7SMjvvi4bx_638,74286
-rda_python_common/PgFile.py,sha256=RSCnABv7jOLmalzkQJnvXe-VgP6OQl3boeL8-Ja9qfY,98379
-rda_python_common/PgLOG.py,sha256=5j3vyZNJM3K0kECiJYVs9Y-I9gzoeE28Tlj5F1v7foo,54033
+rda_python_common/PgDBI.py,sha256=iGy0SQZsdVbSz2ewTIUK3e-RQBC5eQM9-_XUcFU1c50,74211
+rda_python_common/PgFile.py,sha256=nCZcSYdKaa1okVVEvj1Wx6OUbYNAbPWYedoCNvqevQU,98405
+rda_python_common/PgLOG.py,sha256=ZbXbOshjGwqYxpUAqTZqkViOBEZ_zVZF_t2SZ_q_AJg,54149
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=BAfuNi_1jEK-UyYVfPY_0f4b7KLhpcFM3BDShLRvT7w,55446
 rda_python_common/PgSIG.py,sha256=oDXcSnnzW6wKm_cSpFxQZWAo2hpPPTcuNDYhPSNQcRc,35607
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OpkNDwt694ebttNNUEDrrtDKyITZkx8g3uAI3b_FF4c,48737
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.15.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.15.dist-info/METADATA,sha256=pjXuN892u24qa-KwVU46JJJsbRz_n-eDATkYn7JsQC4,652
-rda_python_common-1.0.15.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rda_python_common-1.0.15.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.15.dist-info/RECORD,,
+rda_python_common-1.0.17.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.17.dist-info/METADATA,sha256=JOGDLYq0Z3xG0w-JTzBzmHg0WJCmIN0PBTd1DD8ZkuI,652
+rda_python_common-1.0.17.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rda_python_common-1.0.17.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.17.dist-info/RECORD,,