diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-04-25 18:05:55 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-04-25 18:05:55 -0400 |
| commit | b720937d0af9e8382c8b9e00b2c0d5715b7cfbe5 (patch) | |
| tree | c29ce9e7423c4f89e79634991941e5bdf9d07a15 /setuptools/command/install_scripts.py | |
| parent | 8b494633df0f6770946092498aed76fd30be99b1 (diff) | |
| parent | b5fa6ad11e1344648b470ff0d847a7d940b4c99d (diff) | |
| download | python-setuptools-git-feature/distutils-docs.tar.gz | |
Merge branch 'main' into feature/distutils-docsfeature/distutils-docs
Diffstat (limited to 'setuptools/command/install_scripts.py')
| -rw-r--r-- | setuptools/command/install_scripts.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py index 8c9a15e2..9cd8eb06 100644 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py @@ -1,5 +1,6 @@ from distutils import log import distutils.command.install_scripts as orig +from distutils.errors import DistutilsModuleError import os import sys @@ -35,7 +36,7 @@ class install_scripts(orig.install_scripts): try: bw_cmd = self.get_finalized_command("bdist_wininst") is_wininst = getattr(bw_cmd, '_is_running', False) - except ImportError: + except (ImportError, DistutilsModuleError): is_wininst = False writer = ei.ScriptWriter if is_wininst: |