fix the multi-pkg mis-check

This commit is contained in:
desert-sailor 2023-06-01 17:01:11 +08:00
parent 4de8192b84
commit 00c5381fed
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From 64ed7c83687cb7ee313ac3da62895ae2f6de215b Mon Sep 17 00:00:00 2001
From: desert-sailor <dxwangk@isoftstone.com>
Date: Thu, 1 Jun 2023 16:53:02 +0800
Subject: [PATCH] fix the multipkg mis-check
---
flit_core/flit_core/common.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py
index 68d91bb..3c43522 100644
--- a/flit_core/flit_core/common.py
+++ b/flit_core/flit_core/common.py
@@ -29,7 +29,7 @@ class Module(object):
src_py_file = directory / 'src' / (name_as_path+'.py')
existing = set()
- if pkg_dir.is_dir():
+ if pkg_dir.is_dir() and name_as_path.strip() != "build":
self.path = pkg_dir
self.is_package = True
self.prefix = ''
--
2.33.0

View File

@ -1,11 +1,12 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-flit Name: python-flit
Version: 3.8.0 Version: 3.8.0
Release: 1 Release: 2
Summary: Simplified packaging of Python modules Summary: Simplified packaging of Python modules
License: BSD-3-Clause License: BSD-3-Clause
URL: https://flit.readthedocs.io/en/latest/ URL: https://flit.readthedocs.io/en/latest/
Source0: https://files.pythonhosted.org/packages/28/c6/c399f38dab6d3a2518a50d334d038083483a787f663743d713f1d245bde3/flit-3.8.0.tar.gz Source0: https://files.pythonhosted.org/packages/28/c6/c399f38dab6d3a2518a50d334d038083483a787f663743d713f1d245bde3/flit-3.8.0.tar.gz
Patch1: 0001-fix-the-multipkg-mis-check.patch
BuildArch: noarch BuildArch: noarch
Requires: python3-requests python3-docutils python3-toml python3-setuptools Requires: python3-requests python3-docutils python3-toml python3-setuptools
@ -32,7 +33,7 @@ Requires: python3-toml
This provides a PEP 517 build backend for packages using Flit. The only public interface is the API specified by PEP 517, at flit_core.buildapi. This provides a PEP 517 build backend for packages using Flit. The only public interface is the API specified by PEP 517, at flit_core.buildapi.
%prep %prep
%autosetup -n flit-%{version} %autosetup -p1 -n flit-%{version}
%build %build
export FLIT_NO_NETWORK=1 export FLIT_NO_NETWORK=1
@ -61,6 +62,9 @@ pip3 install -I build/flit-%{version}-py3-none-any.whl --root %{buildroot} --no-
%doc README.rst %doc README.rst
%changelog %changelog
* Thu Jun 1 2023 Dongxing Wang <dxwangk@isoftstone.com> - 3.8.0-2
- fix multipkg mis-check
* Tue Apr 25 2023 liyanan <thistleslyn@163.com> - 3.8.0-1 * Tue Apr 25 2023 liyanan <thistleslyn@163.com> - 3.8.0-1
- Update to 3.8.0 - Update to 3.8.0