aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-01-09 00:45:22 +0000
committerPascal Terjan <pterjan@mageia.org>2020-01-09 00:45:22 +0000
commitd24ef00112fdd91f1bca76f6347ab1e7b15e4e14 (patch)
tree9db019fdb6298d936da41bbb50920987a4273373
parentb2174a11f181aab288cfd6d7c2f427aa4e06c7d4 (diff)
downloadiurt-d24ef00112fdd91f1bca76f6347ab1e7b15e4e14.tar
iurt-d24ef00112fdd91f1bca76f6347ab1e7b15e4e14.tar.gz
iurt-d24ef00112fdd91f1bca76f6347ab1e7b15e4e14.tar.bz2
iurt-d24ef00112fdd91f1bca76f6347ab1e7b15e4e14.tar.xz
iurt-d24ef00112fdd91f1bca76f6347ab1e7b15e4e14.zip
Allow - in host when parsing lock file name
-rw-r--r--NEWS2
-rw-r--r--lib/Iurt/Queue.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 74375f0..4fa0d14 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- ulri: allow - in host when parsing lock file name
+
0.7.9
- ulri: call setarch for all 32bit targets rather than only when target is
i586, this allows to build for 32bit arm on aarch64.
diff --git a/lib/Iurt/Queue.pm b/lib/Iurt/Queue.pm
index 171ff97..541bbff 100644
--- a/lib/Iurt/Queue.pm
+++ b/lib/Iurt/Queue.pm
@@ -170,7 +170,7 @@ sub get_upload_tree_state {
$pkg_tree{$prefix}{srpm_name}{$name} = $srpm;
}
- if ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_([\w-]+)\.(\w+)\.(\w+)\.(\d{14})\.(\d+)\.lock$/) {
+ if ($r =~ /(\d{14}\.\w+\.\w+\.\d+)_([\w-]+)\.(\w+)\.([\w-]+)\.(\d{14})\.(\d+)\.lock$/) {
my ($prefix, $arch, $bot, $host, $date, $pid) = ($1, $2, $3, $4, $5, $6);
# Set path here too has we may have a lock without the src.rpm