From e1d3fa1bf79ab796ead584e3cdc360ed9a456377 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Mon, 15 May 2006 08:29:30 +0000
Subject: do not lock when rebuilding chroot

---
 iurt2 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/iurt2 b/iurt2
index 0be9eb9..4ab0d39 100755
--- a/iurt2
+++ b/iurt2
@@ -24,9 +24,8 @@
 # TODO
 #
 # - use a cache (rpmctl cache for example) to find maintainer
-# - add a --user option to build into the chroot with an alternate user
-# - add a --stop bi option to only do the bi step of rpm compilation and stop afterwards
 # - add icecream compilation support
+# - add a --set option to compile a set of packages
 #
 use strict;
 use Hdlist;
@@ -258,7 +257,7 @@ if ($run{distro} ne 'cooker') {
 # cache file name is needed early to remove the manual lock file if the lock mechanism does not work
 my $cachefile = "$config->{cache_home}/iurt.$run{distro_tag}.$run{my_arch}.$run{media}.cache";
 $run{cachefile} = $cachefile;
-if (!$run{debug} && $run{media} || $run{chroot}) {
+if (!$run{debug} && $run{media}) {
     $run{pidfile_home} = "$config->{cache_home}/";
     $run{pidfile} = "iurt.$run{distro_tag}.$run{my_arch}.$run{media}";
     check_pid(\%run)
@@ -339,7 +338,7 @@ if (!-d $local_spool) {
 if ($config->{rsync_to} && !$run{no_rsync}) { 
     	# remove some old and very big log files not to saturate the server
 	system(qq|find $local_spool/log/ -name "*.log" \\( -size +$config->{log_size_limit} -or -mtime +$config->{log_size_date} \\) -exec rm -f {} \\;|);
-	system("rsync --delete -alHPe 'ssh -c arcfour' $local_spool/log/ $config->{rsync_to}/$run{distro_tag}/$run{my_arch}/log/");
+	system("rsync --delete -alHPe 'ssh -xc arcfour' $local_spool/log/ $config->{rsync_to}/$run{distro_tag}/$run{my_arch}/log/");
 }
 
 print {$run{LOG}} "iurt: try to dump rpm macros to $chroot/home/builder/.rpmmacros\n" if $run{verbose} > 3;
@@ -662,7 +661,7 @@ if (open my $file, ">$local_spool/log/status.$run{media}.log") {
 if ($config->{rsync_to} && !$run{no_rsync}) { 
     	# remove some old and very big log files not to saturate the server
 	system(qq|find $local_spool/log/ -name "*.log" \\( -size +$config->{log_size_limit} -or -mtime +$config->{log_size_date} \\) -exec rm -f {} \\;|);
-	system("rsync --delete -alHPe 'ssh -c arcfour' $local_spool/log/ $config->{rsync_to}/$run{distro_tag}/$run{my_arch}/log/");
+	system("rsync --delete -alHPe 'ssh -xc arcfour' $local_spool/log/ $config->{rsync_to}/$run{distro_tag}/$run{my_arch}/log/");
 }
 
 # one last try to clean
-- 
cgit v1.2.1