summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2018-02-02 15:56:34 +0000
committerBen Brown <ben.brown@codethink.co.uk>2018-02-14 15:23:44 +0000
commitfae89cfea25882ca5ad5910a475c6b39d3c60446 (patch)
tree98c66b5eda878fa4bc6486b767ba1ca799c73f77
parent00a032c5046e8e5b5730413cc1beb900b79dfb13 (diff)
downloadybd-fae89cfea25882ca5ad5910a475c6b39d3c60446.tar.gz
Remove extra '%' from common args
-rw-r--r--ybd/rpm.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/ybd/rpm.py b/ybd/rpm.py
index 71e6f40..d9a17bb 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -18,17 +18,16 @@ import utils
import subprocess
-# Because rpm is otherwise totally broken
+# Common parameters required for rpm.
# NOTE: _build_name_fmt would ordinary be
-# %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+# %{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
# but we are pulling them out of a cache with a different naming scheme now.
-#
common_rpm_args = (
'--dbpath=/var/lib/rpm '
'--define "_rpmconfigdir /usr/lib/rpm" '
'--define "_rpmlock_path /var/lib/rpm/.rpm.lock" '
'--define "_fileattrsdir /usr/lib/rpm/fileattrs" '
- '--define "_build_name_fmt %%{NAME}.rpm" '
+ '--define "_build_name_fmt %{NAME}.rpm" '
'--define "_rpmfilename %{_build_name_fmt}" '
'--define "_tmppath /tmp" '
'--define "_unpackaged_files_terminate_build 0" '