git-cache-proxy: housekeeping: check errno value from stat after deletion

[chiark-utils.git] / scripts / git-cache-proxy

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 2f38de1154be164d316d7fb06579a22841d521c1..b0c9502f8554b8f3f15345f784a624aa5dd6b10f 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -408,14 +408,23 @@ sub housekeeping () {
        eval {
            foreach my $suffix (qw(tmp git)) {
                my $dir = "${subdir}\\.$suffix";
        eval {
            foreach my $suffix (qw(tmp git)) {
                my $dir = "${subdir}\\.$suffix";

+               my $tdir = "${subdir}\\.tmp";
+               if ($dir ne $tdir) {
+                   if (!rename $dir,$tdir) {
+                       next if $! == ENOENT;
+                       die "$dir: cannot rename to $tdir: $!\n";
+                   }
+               }

                my $errs;
                my $errs;

-               remove_tree($dir, { safe=>1, error=>\$errs });
-               if (stat $dir) {
+               remove_tree($tdir, { safe=>1, error=>\$errs });
+               if (!stat $tdir) {

                    foreach my $err (@$errs) {
                        my ($file, $message) = %$err;
                        logm 'info', "problem deleting: $file: $message";
                    }
                    die "$dir: problem deleting file(s)\n";
                    foreach my $err (@$errs) {
                        my ($file, $message) = %$err;
                        logm 'info', "problem deleting: $file: $message";
                    }
                    die "$dir: problem deleting file(s)\n";

+               } elsif ($! != ENOENT) {
+                   die "$tdir: cannot stat after deletion: $!\n";

                }
            }
        };
                }
            }
        };