diff options
| author | Florent Villard <warly@mandriva.com> | 2006-06-13 08:30:31 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2006-06-13 08:30:31 +0000 |
| commit | b20daf460d9128f30d7ade9d4eeb451d32f9e1e4 (patch) | |
| tree | ac647dfe07349783d9feb5eff5e93b8b5569756d | |
| parent | e96aadcedbbd36dfa3f7be0f6f3394db9f766805 (diff) | |
| download | iurt-b20daf460d9128f30d7ade9d4eeb451d32f9e1e4.tar iurt-b20daf460d9128f30d7ade9d4eeb451d32f9e1e4.tar.gz iurt-b20daf460d9128f30d7ade9d4eeb451d32f9e1e4.tar.bz2 iurt-b20daf460d9128f30d7ade9d4eeb451d32f9e1e4.tar.xz iurt-b20daf460d9128f30d7ade9d4eeb451d32f9e1e4.zip | |
fix the unionfs dir cleaning at the end of a run; fix broken deps packages rebuild attempts from time to time
| -rwxr-xr-x | iurt2 | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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; |