fix the unionfs dir cleaning at the end of a run; fix broken deps packages rebuild attempts from time to time

1 files changed, 4 insertions, 2 deletions

diff --git a/iurt2 b/iurt2
index 585afe6..61bef29 100755
--- a/iurt2
+++ b/iurt2
@@ -737,7 +737,8 @@ if ($config->{rsync_to} && !$run{no_rsync}) {
 # one last try to clean
 print {$run{LOG}} "iurt: try to clean remaining unionfs\n" if $run{verbose};
 if ($run{unionfs}) {
-    remove_chroot(\%run, $unionfs_dir, \&clean_all_unionfs)
+    my ($dir) = $unionfs_dir =~ /(.*)\/[^\/]+\/?/;
+    remove_chroot(\%run, $dir, \&clean_all_unionfs)
 }
 unlink "$run{pidfile_home}/$run{pidfile}" if $run{pidfile};
 exit;
@@ -905,7 +906,8 @@ sub check_needed {
 	my $v ||= $version;
 	print {$run{LOG}} "ERROR iurt: $srpm needs $name $v to be compiled.\n";
 	# try to recompile it once in a while
-	return 1 if ! $cache->{warning}{"install_deps_$srpm"}{$maint}++ % 72
+	last if ! $cache->{warning}{"install_deps_$srpm"}{$maint}++ % 72;
+	return 1
     }
     delete $cache->{needed}{$srpm};
     $cache->{needed}{$srpm} = \@n if @n;