From 354001c60abc4be0933abd15128369cc2bf9c55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 1 Mar 2021 17:20:26 +0000 Subject: [PATCH] egg-info doesn't need to have contents.. --- ognibuild/debian/fix_build.py | 6 +++--- ognibuild/resolver/apt.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index 2cfa55d..1d4b336 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -259,7 +259,7 @@ def fix_missing_python_distribution(error, context): # noqa: C901 default = not targeted pypy_pkg = context.apt.get_package_for_paths( - ["/usr/lib/pypy/dist-packages/%s-.*.egg-info/PKG-INFO" % error.distribution], regex=True + ["/usr/lib/pypy/dist-packages/%s-.*.egg-info" % error.distribution], regex=True ) if pypy_pkg is None: pypy_pkg = "pypy-%s" % error.distribution @@ -267,7 +267,7 @@ def fix_missing_python_distribution(error, context): # noqa: C901 pypy_pkg = None py2_pkg = context.apt.get_package_for_paths( - ["/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info/PKG-INFO" % error.distribution], + ["/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info" % error.distribution], regex=True, ) if py2_pkg is None: @@ -276,7 +276,7 @@ def fix_missing_python_distribution(error, context): # noqa: C901 py2_pkg = None py3_pkg = context.apt.get_package_for_paths( - ["/usr/lib/python3/dist-packages/%s-.*.egg-info/PKG-INFO" % error.distribution], + ["/usr/lib/python3/dist-packages/%s-.*.egg-info" % error.distribution], regex=True, ) if py3_pkg is None: diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index 6d470cc..8648700 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -79,15 +79,15 @@ class AptRequirement(Requirement): def get_package_for_python_package(apt_mgr, package, python_version, specs=None): if python_version == "pypy": pkg_name = apt_mgr.get_package_for_paths( - ["/usr/lib/pypy/dist-packages/%s-.*.egg-info/PKG-INFO" % package], + ["/usr/lib/pypy/dist-packages/%s-.*.egg-info" % package], regex=True) elif python_version == "cpython2": pkg_name = apt_mgr.get_package_for_paths( - ["/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info/PKG-INFO" % package], + ["/usr/lib/python2\\.[0-9]/dist-packages/%s-.*.egg-info" % package], regex=True) elif python_version == "cpython3": pkg_name = apt_mgr.get_package_for_paths( - ["/usr/lib/python3/dist-packages/%s-.*.egg-info/PKG-INFO" % package], + ["/usr/lib/python3/dist-packages/%s-.*.egg-info" % package], regex=True) else: raise NotImplementedError