From 76ad82e56807feb60839966a0c141fc6e5016f0b Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mar 12 2022 18:51:30 +0000 Subject: srpm/go.lua meta: Set `%gourl` after `forge.meta` call `forge.meta` sanitizes the result of `%forgeurl`, so we want to set `%gourl` based on the sanitzed value. For example, `forge.meta` changes `https://github.com/cli/cli/v2` to `https://github.com/cli/cli`. Signed-off-by: Maxwell G --- diff --git a/rpm/lua/srpm/go.lua b/rpm/lua/srpm/go.lua index 00ffcde..e6ac636 100644 --- a/rpm/lua/srpm/go.lua +++ b/rpm/lua/srpm/go.lua @@ -98,13 +98,11 @@ local function meta(suffix, verbose, informative, silent) if (cleangoipath ~= spec["goipath"]) then fedora.explicitset(goipath .. suffix, cleangoipath) end - if (spec["forgeurl"] ~= "") then - fedora.safeset("gourl" .. suffix, "%{forgeurl" .. suffix .. "}",verbose) - else - fedora.safeset("gourl" .. suffix, "https://%{goipath" .. suffix .. "}",verbose) - fedora.safeset("forgeurl" .. suffix, "%{gourl" .. suffix .. "}",verbose) + if (spec["forgeurl"] == "") then + fedora.safeset("forgeurl" .. suffix, "https://%{goipath" .. suffix .. "}",verbose) end forge.meta(suffix, verbose, informative, silent) + fedora.safeset("gourl" .. suffix, "%{forgeurl" .. suffix .. "}",verbose) if (rpm.expand("%{?forgesource" .. suffix .. "}") ~= "") then fedora.safeset("gosource" .. suffix, "%{forgesource" .. suffix .. "}",verbose) else