Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hua work dsarch #7

Merged
merged 3 commits into from
Feb 4, 2025
Merged

Hua work dsarch #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
104c1b2
call PgFile.file_backup_status()
Feb 3, 2025
da25117
=> 1.0.5
Feb 4, 2025
5847172
pyhton => python
Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "rda_python_dsarch"
version = "1.0.4"
version = "1.0.5"
authors = [
{ name="Zaihua Ji", email="[email protected]" },
]
Expand All @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions src/rda_python_dsarch/dsarch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down