mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-13 06:34:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dev' into plugins-browsertrix

Browse source
This commit is contained in:
Nick Sweeting 2024-02-12 21:28:58 -08:00
commit edabc47828
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
archivebox/system.py
View file

@ -30,8 +30,7 @@ def run(cmd, *args, input=None, capture_output=True, timeout=None, check=False,
if capture_output: if capture_output:
if ('stdout' in kwargs) or ('stderr' in kwargs): if ('stdout' in kwargs) or ('stderr' in kwargs):
raise ValueError('stdout and stderr arguments may not be used ' raise ValueError('stdout and stderr arguments may not be used with capture_output.')
'with capture_output.')
kwargs['stdout'] = PIPE kwargs['stdout'] = PIPE
kwargs['stderr'] = PIPE kwargs['stderr'] = PIPE
@ -175,7 +174,7 @@ def dedupe_cron_jobs(cron: CronTab) -> CronTab:
deduped: Set[Tuple[str, str]] = set() deduped: Set[Tuple[str, str]] = set()
for job in list(cron): for job in list(cron):
unique_tuple = (str(job.slices), job.command) unique_tuple = (str(job.slices), str(job.command))
if unique_tuple not in deduped: if unique_tuple not in deduped:
deduped.add(unique_tuple) deduped.add(unique_tuple)
cron.remove(job) cron.remove(job)