From fae89cfea25882ca5ad5910a475c6b39d3c60446 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 2 Feb 2018 15:56:34 +0000 Subject: Remove extra '%' from common args --- ybd/rpm.py | 7 +++---- 1 file 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" ' -- cgit v1.2.1