forgeversion: make version set after release a warning
Let's make parsing a bit more resilient.
This commit is contained in:
parent
25d1084489
commit
9e9ff33b6e
2 changed files with 3 additions and 4 deletions
|
|
@ -113,7 +113,7 @@ end
|
|||
-- Release uses %dist and %distprefix, so we need to make sure it's not used before
|
||||
if util.is_defined("release") then
|
||||
rpm.expand(
|
||||
"%{error:'Version: %%forgeversion' must be invoked before setting Release.}"
|
||||
"%{warn:'Version: %%forgeversion' must be invoked before setting Release.}"
|
||||
)
|
||||
end
|
||||
\
|
||||
|
|
|
|||
|
|
@ -488,9 +488,8 @@ cases:
|
|||
defines:
|
||||
version: "1.0.0"
|
||||
release: "0"
|
||||
evals:
|
||||
- "%{forgeversion}"
|
||||
should_fail: true
|
||||
expected:
|
||||
forgeversion: "1.0.0"
|
||||
stderr_contains: "'Version: %forgeversion' must be invoked before setting Release."
|
||||
|
||||
- id: unit_forge_version
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue