rpms/python-rpm-generators
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't define global Lua variables from Python generator

Browse Source
This commit is contained in:
Miro Hrončok 2020-04-28 14:47:32 +02:00
parent 0ec8581037
commit c8249102ec
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-rpm-generators.spec
View File

@ -1,7 +1,7 @@
Name: python-rpm-generators Name: python-rpm-generators
Summary: Dependency generators for Python RPMs Summary: Dependency generators for Python RPMs
Version: 11 Version: 11
Release: 3%{?dist} Release: 4%{?dist}
# Originally all those files were part of RPM, so license is kept here # Originally all those files were part of RPM, so license is kept here
License: GPLv2+ License: GPLv2+
@ -45,6 +45,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondistdeps.py
%{_rpmconfigdir}/pythondistdeps.py %{_rpmconfigdir}/pythondistdeps.py
%changelog %changelog
* Tue Apr 28 2020 Miro Hrončok <mhroncok@redhat.com> - 11-4
- Don't define global Lua variables from Python generator
* Mon Apr 20 2020 Gordon Messmer <gordon.messmer@gmail.com> - 11-3 * Mon Apr 20 2020 Gordon Messmer <gordon.messmer@gmail.com> - 11-3
- Handle all-zero versions without crashing - Handle all-zero versions without crashing

4
python.attr
View File

@ -6,7 +6,7 @@
-- (Don't match against -config tools e.g. /usr/bin/python2.6-config) -- (Don't match against -config tools e.g. /usr/bin/python2.6-config)
local path = rpm.expand('%1') local path = rpm.expand('%1')
if path:match('/usr/bin/python%d+%.%d+$') then if path:match('/usr/bin/python%d+%.%d+$') then
provides = path:gsub('.*/usr/bin/python(%d+%.%d+)', 'python(abi) = %1') local provides = path:gsub('.*/usr/bin/python(%d+%.%d+)', 'python(abi) = %1')
print(provides) print(provides)
end end
} }
@ -19,7 +19,7 @@
-- python(abi) = MAJOR.MINOR -- python(abi) = MAJOR.MINOR
local path = rpm.expand('%1') local path = rpm.expand('%1')
if path:match('/usr/lib%d*/python%d+%.%d+/.*') then if path:match('/usr/lib%d*/python%d+%.%d+/.*') then
requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1') local requires = path:gsub('.*/usr/lib%d*/python(%d+%.%d+)/.*', 'python(abi) = %1')
print(requires) print(requires)
end end
} }