diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2021-11-24 14:37:39 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2021-11-24 14:39:11 +0000 |
| commit | 9834b77b7a810dffd2bc661bb926e8a1d8696878 (patch) | |
| tree | f50ae691b0f04421855d1404ef92ffb7cb7e97ef | |
| parent | f4e247130f7cbbb043f7eaa8dcba2bd9a3d11a0f (diff) | |
| download | iurt-9834b77b7a810dffd2bc661bb926e8a1d8696878.tar iurt-9834b77b7a810dffd2bc661bb926e8a1d8696878.tar.gz iurt-9834b77b7a810dffd2bc661bb926e8a1d8696878.tar.bz2 iurt-9834b77b7a810dffd2bc661bb926e8a1d8696878.tar.xz iurt-9834b77b7a810dffd2bc661bb926e8a1d8696878.zip | |
Have rpmspec drop the newline directly
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index c905034..4214893 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -526,7 +526,7 @@ sub recreate_srpm { # return 0 unless $ret; - if (!perform_command(qq(chroot $chroot_tmp su $luser -c "rpmspec -q --srpm /home/$luser/rpmbuild/SPECS/$spec > /home/$luser/rpmbuild/SPECS/$spec.srpm_name"), + if (!perform_command(qq(chroot $chroot_tmp su $luser -c "rpmspec -q --qf %{NVR}.src.rpm --srpm /home/$luser/rpmbuild/SPECS/$spec > /home/$luser/rpmbuild/SPECS/$spec.srpm_name"), $run, $config, use_iurt_root_command => 1, hash => "identify_$srpm")) { @@ -534,7 +534,6 @@ sub recreate_srpm { return; } my $generated_srpm_name = cat_("$chroot_tmp/home/$luser/rpmbuild/SPECS/$spec.srpm_name"); - $generated_srpm_name =~ s/\s+$//; if (!$generated_srpm_name) { plog("ERROR: failed to get the name of the generated src.rpm"); return; |