summaryrefslogtreecommitdiff
path: root/src/buildstream/_pluginfactory/pluginoriginpip.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildstream/_pluginfactory/pluginoriginpip.py')
-rw-r--r--src/buildstream/_pluginfactory/pluginoriginpip.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/buildstream/_pluginfactory/pluginoriginpip.py b/src/buildstream/_pluginfactory/pluginoriginpip.py
index 59b5d5251..0db091fd9 100644
--- a/src/buildstream/_pluginfactory/pluginoriginpip.py
+++ b/src/buildstream/_pluginfactory/pluginoriginpip.py
@@ -63,7 +63,12 @@ class PluginOriginPip(PluginOrigin):
detail=e.report(),
reason="package-version-conflict",
) from e
- except pkg_resources.RequirementParseError as e:
+ except (
+ # For setuptools < 49.0.0
+ pkg_resources.RequirementParseError,
+ # For setuptools >= 49.0.0
+ pkg_resources.extern.packaging.requirements.InvalidRequirement,
+ ) as e:
raise PluginError(
"{}: Malformed package-name '{}' encountered: {}".format(
self.provenance_node.get_provenance(), self._package_name, e