Fix getting package name from src.rpm

Name is prefixed by revision on the buuld system. Also, this was
already done for build_timeout so share the code.

2 files changed, 5 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index c415f8d..eac421b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.7.4
+- iurt: fix getting package name from src.rpm name
+
 0.7.3
 - iurt: change use_netns to allow per package setting
 
diff --git a/iurt b/iurt
index b71f9fc..6cf9b3d 100755
--- a/iurt
+++ b/iurt
@@ -720,8 +720,8 @@ sub rebuild_one {
 retry:
     $urpmi->clean_urpmi_process;
 	
-    $srpm =~ /(.*)-[^-]+-[^-]+\.src\.rpm$/ or return $srpm;
-    my $srpm_name = $1;
+    my ($srpm_name) = $srpm =~ /(?:.*:)?(.*)-[^-]+-[^-]+\.src\.rpm$/;
+    $srpm_name or return $srpm;
 
     if (!$run{use_old_chroot}) {
 	plog('DEBUG', 'Not reusing old chroot');
@@ -810,7 +810,6 @@ retry:
 	$command = "rpmbuild -b$run{stop} /home/$luser/rpmbuild/SPECS/$spec";
     }
     
-    my ($srpm_name) = $srpm =~ /(?:.*:)?(.*)-[^-]+-[^-]+\.src\.rpm$/;
     my $icecream;
     if ($run{icecream}) {
 	$icecream = "RPM_BUILD_NCPUS=$run{icecream}";