summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiro HronĨok <miro@hroncok.cz>2019-04-16 11:26:37 +0200
committerPanu Matilainen <pmatilai@redhat.com>2020-03-26 11:57:58 +0200
commitb5b1a7f523751cffe69db4ce0d18369cf724900c (patch)
tree5823b6f4f013753003f1b02f035905ab2eba1634
parent506fcaf8f931afae5a3b9f2587e8c1ec30cce8b6 (diff)
downloadrpm-b5b1a7f523751cffe69db4ce0d18369cf724900c.tar.gz
Python generators: console_scripts entry points require setuptools
Fixes https://github.com/rpm-software-management/rpm/issues/664 (cherry picked from commit 98d6b7bce028a7d6615a7c81c5a63d2b72825847)
-rwxr-xr-xscripts/pythondistdeps.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
index ac1cd6229..8d8bbfc19 100755
--- a/scripts/pythondistdeps.py
+++ b/scripts/pythondistdeps.py
@@ -102,7 +102,7 @@ for f in files:
lower.endswith('.egg-info') or \
lower.endswith('.dist-info'):
# This import is very slow, so only do it if needed
- from pkg_resources import Distribution, FileMetadata, PathMetadata
+ from pkg_resources import Distribution, FileMetadata, PathMetadata, Requirement
dist_name = basename(f)
if isdir(f):
path_item = dirname(f)
@@ -174,6 +174,11 @@ for f in files:
if dep in deps:
depsextras.remove(dep)
deps = depsextras
+ # console_scripts/gui_scripts entry points need pkg_resources from setuptools
+ if (dist.get_entry_map('console_scripts') or
+ dist.get_entry_map('gui_scripts')):
+ # stick them first so any more specific requirement overrides it
+ deps.insert(0, Requirement.parse('setuptools'))
# add requires/recommends based on egg/dist metadata
for dep in deps:
if legacy: