From 78348fb1f44e8f3a512a8fe3d5e1286280908589 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 1 Dec 2011 22:08:51 +0000 Subject: Use a different directory for each arch on build machine, avoid probelems when both arch of the same package are built on the same node at the same time --- ulri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ulri b/ulri index adf14c2..8c1560e 100755 --- a/ulri +++ b/ulri @@ -324,7 +324,7 @@ foreach my $prefix (keys %pkg_tree) { $lock_file =~ s/-noarch//; } - my $prefix_dir = "$bot_conf->{packages}/$path/$prefix/"; + my $prefix_dir = "$bot_conf->{packages}/$path/$prefix-$arch/"; my $status_file = "$prefix_dir/log/status.log"; plog('INFO', "check status: $host/$arch ($bot [$pid])"); @@ -635,7 +635,7 @@ foreach my $prefix (sort keys %pkg_tree) { my $remote = ssh_setup($config->{ssh_options}, $bot_conf->{user}, $host); - my $prefix_dir = "$bot_conf->{packages}/$path/$prefix/"; + my $prefix_dir = "$bot_conf->{packages}/$path/$prefix-$arch/"; my $status_file = "$prefix_dir/log/status.log"; # Copy packages to build node @@ -665,7 +665,7 @@ foreach my $prefix (sort keys %pkg_tree) { my $temp = mktemp("$config->{tmp}/ulri.tmp.$prefix.XXXXX"); my $cmd = $bot_conf->{command}; $cmd =~ s!__ARCH__!$arch!g; - $cmd =~ s!__DIR__!$path/$prefix!g; + $cmd =~ s!__DIR__!$path/$prefix-$arch!g; $cmd =~ s!__TARGET__!$target!g; $cmd =~ s!__PACKAGER__!$user!g; my $section = $media; -- cgit v1.2.1