| 1 |
pterjan |
1934466 |
From fff6b7df49063a3f7cbd42c2c2f87a9b6563cab2 Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: Pascal Terjan <pterjan@mageia.org> |
| 3 |
|
|
Date: Thu, 19 Jan 2023 23:57:33 +0000 |
| 4 |
|
|
Subject: [PATCH] iurt: Fix buildreqs.nosrc.rpm filename on Mageia build system |
| 5 |
|
|
|
| 6 |
|
|
--- |
| 7 |
|
|
NEWS | 2 ++ |
| 8 |
|
|
lib/Iurt/Urpmi.pm | 14 +++++++++++++- |
| 9 |
|
|
2 files changed, 15 insertions(+), 1 deletion(-) |
| 10 |
|
|
|
| 11 |
|
|
diff --git a/NEWS b/NEWS |
| 12 |
|
|
index 1c548ec..d60fdec 100644 |
| 13 |
|
|
--- a/NEWS |
| 14 |
|
|
+++ b/NEWS |
| 15 |
|
|
@@ -1,3 +1,5 @@ |
| 16 |
|
|
+- iurt: Fix buildreqs.nosrc.rpm filename on Mageia build system |
| 17 |
|
|
+ |
| 18 |
|
|
0.8.0 |
| 19 |
|
|
- iurt: Add support for DynamicBuildRequires |
| 20 |
|
|
- ulri: Do not remove lock file and mark build as done until we copied the |
| 21 |
|
|
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm |
| 22 |
|
|
index 0f084c9..aec4f87 100644 |
| 23 |
|
|
--- a/lib/Iurt/Urpmi.pm |
| 24 |
|
|
+++ b/lib/Iurt/Urpmi.pm |
| 25 |
|
|
@@ -566,7 +566,19 @@ sub install_dynamic_buildrequires { |
| 26 |
|
|
return 1; |
| 27 |
|
|
} |
| 28 |
|
|
|
| 29 |
|
|
- my $nosrc = $srpm =~ s/src.rpm$/buildreqs.nosrc.rpm/r; |
| 30 |
|
|
+ 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"), |
| 31 |
|
|
+ $run, $config, |
| 32 |
|
|
+ use_iurt_root_command => 1, |
| 33 |
|
|
+ hash => "identify_$srpm")) { |
| 34 |
|
|
+ plog("ERROR: failed to get the name of the generated src.rpm"); |
| 35 |
|
|
+ return; |
| 36 |
|
|
+ } |
| 37 |
|
|
+ my $new_srpm = cat_("$chroot_tmp/home/$luser/rpmbuild/SPECS/$spec.srpm_name"); |
| 38 |
|
|
+ if (!$new_srpm) { |
| 39 |
|
|
+ plog("ERROR: failed to get the name of the generated src.rpm"); |
| 40 |
|
|
+ return; |
| 41 |
|
|
+ } |
| 42 |
|
|
+ my $nosrc = $new_srpm =~ s/src.rpm$/buildreqs.nosrc.rpm/r; |
| 43 |
|
|
|
| 44 |
|
|
while (1) { |
| 45 |
|
|
# There is no way with perform_command to get the actual error code. |
| 46 |
|
|
-- |
| 47 |
|
|
2.39.1 |
| 48 |
|
|
|
Parent Directory
| 
Revision Log