rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

forge: add more distprefix cleaning (bz1646724)

Browse Source
This commit is contained in:
Nicolas Mailhot 2018-11-06 17:47:28 +01:00
parent 65fc49d917
commit 455084c511
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forge.lua
View File

@ -194,12 +194,13 @@ local function forgemeta(suffix, verbose, informative, silent)
-- dist processing (computing the correct prefix for snapshots) -- dist processing (computing the correct prefix for snapshots)
local distprefix = "" local distprefix = ""
if not isrelease then if not isrelease then
distprefix = rpm.expand(ref) distprefix = string.lower(rpm.expand(ref))
if (ref == "%{?commit" .. suffix .. "}") then if (ref == "%{?commit" .. suffix .. "}") then
distprefix = string.sub(distprefix, 1, 7) distprefix = string.sub(distprefix, 1, 7)
elseif (ref ~= "%{?branch" .. suffix .. "}") then elseif (ref ~= "%{?branch" .. suffix .. "}") then
distprefix = string.gsub(distprefix, "[%p%s]+", ".") distprefix = string.gsub(distprefix, "[%p%s]+", ".")
local v = string.gsub(spec["version"], "[%p%s]+", ".") distprefix = string.gsub(distprefix, "^" .. string.lower(rpm.expand("%{?repo}")) .. "%.?", "")
local v = string.gsub(rpm.expand("%{version}"), "[%p%s]+", ".")
for _, p in ipairs({'','v','v.','version','version.'}) do for _, p in ipairs({'','v','v.','version','version.'}) do
distprefix = getversionsuffix(distprefix, p .. v) distprefix = getversionsuffix(distprefix, p .. v)
end end