Skip to content

shell to True for subprocess #41

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

Merged
zaihuaji merged 1 commit into from
Jan 22, 2026
Merged

shell to True for subprocess #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "rda_python_dsarch"
version = "2.0.4"
version = "2.0.5"
authors = [
{ name="Zaihua Ji", email="[email protected]" },
]
Expand Down
4 changes: 2 additions & 2 deletions src/rda_python_dsarch/dsarch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4123,12 +4123,12 @@ def reset_group_metadata(self, dsid, act):
gindex = "all"
if not pgrec: continue
if act == 1 or act&4 and re.search(r'(Y|B|W)', pgrec['meta_link']):
self.pgsystem("{} -d {} -rw {}".format(self.PGOPT['scm'], dsid, gindex))
self.pgsystem("{} -d {} -rw {}".format(self.PGOPT['scm'], dsid, gindex), self.LOGWRN, 1029)
else:
pgrec = self.pgget("dataset", "meta_link", dcnd, self.LGEREX)
if pgrec:
if act == 1 or act&4 and re.search(r'(Y|B|W)', pgrec['meta_link']):
self.pgsystem("{} -d {} -rw all".format(self.PGOPT['scm'], dsid))
self.pgsystem("{} -d {} -rw all".format(self.PGOPT['scm'], dsid, self.LOGWRN, 1029))

# get web file name for given local file name
def get_archive_filename(self, lfile):
Expand Down
10 changes: 5 additions & 5 deletions src/rda_python_dsarch/pg_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def process_meta_gather(self, cate, logact = None):
act = logact
if act&self.EXITLG:
act &= ~self.EXITLG
if self.PGLOG['DSCHECK']: opt |= 256
if self.PGLOG['DSCHECK']: opt |= 1280 # 256 + 1024
self.PGLOG['ERR2STD'] = ["Warning: ", "already up-to-date", "process currently running",
"rsync", "No route to host", "''*'"]
self.switch_logfile("gatherxml")
Expand Down Expand Up @@ -517,7 +517,7 @@ def process_meta_delete(self, cate, logact = None):
act = logact
if act&self.EXITLG:
act &= ~self.EXITLG
if self.PGLOG['DSCHECK']: opt |= 256
if self.PGLOG['DSCHECK']: opt |= 1280 # 256 + 1024
self.PGLOG['ERR2STD'] = ["Warning: "]
self.switch_logfile("gatherxml")
for d in self.META[c]:
Expand Down Expand Up @@ -546,7 +546,7 @@ def delete_file_metadata(self, dsid, file, logact = None):
opt = 5
if logact&self.EXITLG:
logact &= ~self.EXITLG
if self.PGLOG['DSCHECK']: opt |= 256
if self.PGLOG['DSCHECK']: opt |= 1280 # 256 + 1024
self.PGLOG['ERR2STD'] = ["Warning: "]
self.switch_logfile("gatherxml")
if not self.pgsystem("{} -d {} {}".format(self.CMD['DX'], d, file), logact, opt) and self.PGLOG['SYSERR']:
Expand All @@ -565,7 +565,7 @@ def process_meta_move(self, cate, logact = None):
act = logact
if act&self.EXITLG:
act &= ~self.EXITLG
if self.PGLOG['DSCHECK']: opt |= 256
if self.PGLOG['DSCHECK']: opt |= 1280 # 256 + 1024
self.PGLOG['ERR2STD'] = ["Warning: "]
self.switch_logfile("gatherxml")
for d in self.META[c]:
Expand Down Expand Up @@ -605,7 +605,7 @@ def process_meta_summary(self, cate, logact = None):
act = logact
if act&self.EXITLG:
act &= ~self.EXITLG
if self.PGLOG['DSCHECK']: opt |= 256
if self.PGLOG['DSCHECK']: opt |= 1280 # 256 + 1024
self.PGLOG['ERR2STD'] = ["Warning: "]
self.switch_logfile("gatherxml")
for d in self.META[c]:
Expand Down