From 04c9b1adee16b12d60cbd98bfe132ce31e5a45d0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 30 Apr 2020 10:31:28 +0200 Subject: just use only one variable Thus we got a shorter command which will help for next commits --- t/02create_pkgs.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t index eaa52680..d6d48b71 100644 --- a/t/02create_pkgs.t +++ b/t/02create_pkgs.t @@ -86,11 +86,11 @@ sub rpmbuild { my $dir = getcwd(); my ($target) = $spec =~ m!-(i586|x86_64)\.spec$!; - $target = $target ? "--target $target" : ''; + my $extra_args = $target ? "--target $target" : ''; # unsetting %__os_install_post fixes failure to build on FreeBSD: - my $nopost = " --define '__os_install_post %nil'"; - my $rpmv = "--define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' "; - system_("rpmbuild --quiet $rpmv --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $nopost $target $spec"); + $extra_args .= " --define '__os_install_post %nil'"; + $extra_args .= " --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' "; + system_("rpmbuild --quiet --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $extra_args $spec"); my ($name) = $spec =~ m!([^/]*)\.spec$!; -- cgit v1.2.1