Mageia Bugzilla – Attachment 12985 Details for
Bug 29460
%mkrel 2 is not expanded in bm message
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
[Patch] for bm
evaluate_mkrel_in_release.patch (text/plain), 939 bytes, created by
papoteur
on 2021-11-12 08:45:01 CET
(
hide
)
Description:
[Patch] for bm
Filename:
MIME Type:
Creator:
papoteur
Created:
2021-11-12 08:45:01 CET
Size:
939 bytes
patch
obsolete
>diff --git a/BuildManager/package.py b/BuildManager/package.py >index 031e36e..195e3b9 100644 >--- a/BuildManager/package.py >+++ b/BuildManager/package.py >@@ -110,7 +110,12 @@ class _package_spec(_package): > elif not self.version and lowerline[:8] == "version:": > self.version = self._rpm_vars((line[8:]).strip(), defines) > elif not self.release and lowerline[:8] == "release:": >- self.release = self._rpm_vars((line[8:]).strip(), defines) >+ rel = self._rpm_vars((line[8:]).strip(), defines) >+ if rel.startswith("%mkrel"): >+ p = subprocess.run(["rpm", "--eval", rel], text=True, capture_output=True) >+ self.release = p.stdout >+ else: >+ self.release = rel > elif lowerline[:7] == "%define": > token = (line[7:]).split() > if len(token) == 2:
diff --git a/BuildManager/package.py b/BuildManager/package.py index 031e36e..195e3b9 100644 --- a/BuildManager/package.py +++ b/BuildManager/package.py @@ -110,7 +110,12 @@ class _package_spec(_package): elif not self.version and lowerline[:8] == "version:": self.version = self._rpm_vars((line[8:]).strip(), defines) elif not self.release and lowerline[:8] == "release:": - self.release = self._rpm_vars((line[8:]).strip(), defines) + rel = self._rpm_vars((line[8:]).strip(), defines) + if rel.startswith("%mkrel"): + p = subprocess.run(["rpm", "--eval", rel], text=True, capture_output=True) + self.release = p.stdout + else: + self.release = rel elif lowerline[:7] == "%define": token = (line[7:]).split() if len(token) == 2:
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 29460
: 12985