Skip to content

Commit 85161d7

Browse files
authored
Merge pull request #6112 from stsewd/dont-log-buildenv-warning
Don't log BuildEnvironmentWarning as error
2 parents 83e31f8 + 3bdbdbc commit 85161d7

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

readthedocs/vcs_support/base.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# -*- coding: utf-8 -*-
2-
31
"""Base classes for VCS backends."""
42
import logging
53
import os
64
import shutil
75

6+
from readthedocs.doc_builder.exceptions import BuildEnvironmentWarning
7+
from readthedocs.projects.exceptions import RepositoryError
8+
89

910
log = logging.getLogger(__name__)
1011

@@ -102,7 +103,13 @@ def run(self, *cmd, **kwargs):
102103
'shell': False,
103104
})
104105

105-
build_cmd = self.environment.run(*cmd, **kwargs)
106+
try:
107+
build_cmd = self.environment.run(*cmd, **kwargs)
108+
except BuildEnvironmentWarning as e:
109+
# Re raise as RepositoryError,
110+
# so isn't logged as ERROR.
111+
raise RepositoryError(str(e))
112+
106113
# Return a tuple to keep compatibility
107114
return (build_cmd.exit_code, build_cmd.output, build_cmd.error)
108115

0 commit comments

Comments
 (0)