rda-python-dsarch 1.0.4__tar.gz → 1.0.6__tar.gz

{rda_python_dsarch-1.0.4 → rda_python_dsarch-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rda_python_dsarch
-Version: 1.0.4
+Version: 1.0.6
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch

{rda_python_dsarch-1.0.4 → rda_python_dsarch-1.0.6}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dsarch"
-version = "1.0.4"
+version = "1.0.6"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -28,7 +28,7 @@ include-package-data = true
 where = ["src"]
 
 [tool.setuptools.package-data]
-"rda_pyhton_dsarch" = ["dsarch.usg", "dsarch.c"]
+"rda_python_dsarch" = ["dsarch.usg", "dsarch.c"]
 
 [project.urls]
 "Homepage" = "https://github.com/NCAR/rda-python-dsarch"

{rda_python_dsarch-1.0.4 → rda_python_dsarch-1.0.6}/src/rda_python_dsarch/dsarch.c

@@ -3,16 +3,17 @@
  *    Title: dsarch.c
  *   Author: Zaihua Ji, zji@ucar.edu
  *     Date: 2024-01-30
- *  Purpose: C wrapper to setuid for dsarch python scripts
+ *  Purpose: C wrapper to setuid for a common effective user to
+ *           run dsarch python scripts
  *
  * Instruction:
+ *    after python -m pip install rda_python_dsarch
+ *    cd ../rda_python_dsarch/
+ *    cp dsarch.c $ENVHOME/bin/
+ *    cd $ENVHOME/bin/
+ *    sudo -u CommonUser gcc -o dsarch $ENVHOME/bin/dsarch.c
+ *    sudo -u CommonUser chmod 4750 dsarch
  *
- *    dsarch.c $LOCHOME/bin/dsarch.c
- *    cd $LOCHOME/bin/
- *    gcc -o dsarch dsarch.c
- *    chmod 4750 dsarch
- *
- *    $LOCHOME: /usr/local/decs On DECS machines, and /ncar/rda/setuid on DAV
  *    $ENVHOME: /glade/u/home/rdadata/rdamsenv on DECS machines, and
  *              /glade/work/zji/conda-envs/pg-rda on DAV
  *
@@ -23,25 +24,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libgen.h>
 
 /* main program */
 int main(int argc, char *argv[]) {
-   char *name;
    char prog[128];
-   char pext[] = ".py";
+   char file[] = __FILE__;
 
-   strcpy(prog, getenv("ENVHOME"));
-   strcat(prog, "/bin/");
-   name = strrchr(argv[0], '/');
-   if(name == (char *)NULL) {
-      strcat(prog, argv[0]);
-   } else {
-      strcat(prog, ++name);
-   }
-   name = strrchr(prog, '.');
-   if(name == (char *)NULL || strcmp(name, pext) != 0) {
-      strcat(prog, pext);
-   }
+   strcpy(prog, dirname(file));
+   strcat(prog, "/dsarch.py");
 
    /* call Python script */
    execv(prog, argv);

{rda_python_dsarch-1.0.4 → rda_python_dsarch-1.0.6}/src/rda_python_dsarch/dsarch.py

@@ -22,7 +22,6 @@ from rda_python_common import PgUtil
 from rda_python_common import PgOPT
 from rda_python_common import PgSIG
 from rda_python_common import PgCMD
-from rda_python_common import PgGLBS
 from rda_python_common import PgDBI
 from rda_python_common import PgSplit
 from . import PgMeta
@@ -1661,7 +1660,7 @@ def tar_backup_savedfiles(tarfile, tinfo, ccnt, chkstat):
       if not pgrec:
          PgLOG.pglog("{}-{}: Saved file record not in RDADB".format(dsid, sfile), PgOPT.PGOPT['extlog'])
       elif chkstat and pgrec['bid'] and pgrec['bid'] != tinfo['bid']:
-         PgGLBS.file_backup_status(pgrec, 0, PgOPT.PGOPT['extlog'])
+         PgFile.file_backup_status(pgrec, 0, PgOPT.PGOPT['extlog'])
       if not stype: stype = pgrec['type']
       if pgrec['locflag'] == 'O':
          tardir = tarhome
@@ -1750,7 +1749,7 @@ def tar_backup_webfiles(tarfile, tinfo, ccnt, chkstat):
       if not pgrec:
          PgLOG.pglog("{}-{}: Web file record not in RDADB".format(dsid, wfile), PgOPT.PGOPT['extlog'])
       elif chkstat and pgrec['bid'] and pgrec['bid'] != tinfo['bid']:
-         PgGLBS.file_backup_status(pgrec, 0, PgOPT.PGOPT['extlog'])
+         PgFile.file_backup_status(pgrec, 0, PgOPT.PGOPT['extlog'])
       if pgrec['locflag'] == 'O':
          tardir = tarhome
          webfile = "{}/{}".format(tardir, wfile)

{rda_python_dsarch-1.0.4 → rda_python_dsarch-1.0.6}/src/rda_python_dsarch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rda_python_dsarch
-Version: 1.0.4
+Version: 1.0.6
 Summary: RDA Python package for utility program dsarch archive RDA data
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dsarch