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

Jump to bottom

Fix copying images under parallel execution #11100

Merged
merged 6 commits into from Jan 7, 2023
Merged

Fix copying images under parallel execution #11100

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c841bcf
fix
AA-Turner Jan 6, 2023
5641cbe
fix in other builders
AA-Turner Jan 7, 2023
46a9998
Merge branch '6.1.x' into images-parallel
AA-Turner Jan 7, 2023
495dffe
skip copying converted images
AA-Turner Jan 7, 2023
4c8b590
test
AA-Turner Jan 7, 2023
64a0d48
test
AA-Turner Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions sphinx/builders/html/__init__.py
View file
Open in desktop
Expand Up @@ -764,13 +764,13 @@ def write_domain_indices(self) -> None:
self.handle_page(indexname, indexcontext, 'domainindex.html')

def copy_image_files(self) -> None:
if self.images:
if self.env.images:
stringify_func = ImageAdapter(self.app.env).get_original_image_uri
ensuredir(path.join(self.outdir, self.imagedir))
for src in status_iterator(self.images, __('copying images... '), "brown",
len(self.images), self.app.verbosity,
for src in status_iterator(self.env.images, __('copying images... '), "brown",
len(self.env.images), self.app.verbosity,
stringify_func=stringify_func):
dest = self.images[src]
_docnames, dest = self.env.images[src]
try:
copyfile(path.join(self.srcdir, src),
path.join(self.outdir, self.imagedir, dest))
Expand Down