remove base_dir value

1 files changed, 9 insertions, 9 deletions

diff --git a/iurt2 b/iurt2
index 5aedf8d..83bef78 100755
--- a/iurt2
+++ b/iurt2
@@ -53,24 +53,23 @@ $config->{cache_home} ||= "$HOME/.bugs";
 $config->{supported_arch} ||= ['i586', 'x86_64'];
 $config->{upload} ||= "$HOME/uploads/";
 $config->{local_home} ||= "$HOME";
-$config->{base_dir} ||= "$HOME/uploads/";
 $config->{repository} ||= "/mnt/BIG/dis/";
 $config->{packager} ||= "Iurt";
 $config->{install_chroot_binary} ||= 'install-chroot-tar.sh';
 $config->{distribution} ||= 'Mandriva Linux';
 $config->{vendor} ||= 'Mandriva';
 
-$config->{base_dir} .= $distro_version;
-$config->{base_dir} =~ s/community//g;
+$config->{upload} .= $distro_version;
+$config->{upload} =~ s/community//g;
 if ($distro_version ne 'cooker') {
     if ($media ne 'main') {
-	$config->{base_dir} .= "/$media"
+	$config->{upload} .= "/$media"
     }
 } elsif ($media eq 'contrib') {
-    $config->{base_dir} = "$config->{upload}/contrib"
+    $config->{upload} = "$config->{upload}/contrib"
 }
 
--d $config->{base_dir} or usage("$config->{base_dir} does not exist");
+-d $config->{upload} or usage("$config->{upload} does not exist");
 
 my $pidfile = "$config->{cache_home}/iurt.$distro_tag.$my_arch.pid";
 open my $lock, "$pidfile.lock";
@@ -139,7 +138,7 @@ my @wrong_rpm;
 my %maint;
 
 my @todo;
--d "$config->{base_dir}/build/$my_arch" or mkdir "$config->{base_dir}/build/$my_arch";
+-d "$config->{upload}/build/$my_arch" or mkdir "$config->{upload}/build/$my_arch";
 my $clean;
 my %rep;
 my %done_rpm;
@@ -254,6 +253,7 @@ foreach my $t (@todo) {
 		error => "[REBUILD] install of build dependencies of $srpm failed on $my_arch",  
 		hash => "install_deps_$srpm", 
 		timeout => 600, 
+		freq => 48,
 		cc => $cc, 
 		error_regexp => 'cannot be installed',
 		wait_regexp => 'database locked',
@@ -338,9 +338,9 @@ sub process_queue {
 		my ($rarch, $srpm) = update_srpm($dir, $rpm);
 		$rarch or next;
 		# try to keep the opportunity to prevent disk full
-		my $ok = copy "$dir/$rpm", "$config->{base_dir}/RPMS/";
+		my $ok = copy "$dir/$rpm", "$config->{upload}/RPMS/";
 		if (!$ok){
-			print "ERROR process_queue: cannot copy $dir/$rpm to $config->{base_dir}/RPMS/ ($!)\n";
+			print "ERROR process_queue: cannot copy $dir/$rpm to $config->{upload}/RPMS/ ($!)\n";
 			next
 		}
 		unlink "$dir/$rpm";