X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=maintenance%2FpurgeChangedFiles.php;h=1e702dea779b29af871297dfb9e06c7a5f28e1e3;hb=5a77286a1e32f4fd784b5c2985f149fe39b45073;hp=91c36f28d1a02e82f3f4303ff14981d884cdeb2f;hpb=f2f31fadc7d3aba8588b1ea6410f92166de1ac0a;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/purgeChangedFiles.php b/maintenance/purgeChangedFiles.php index 91c36f28d1..1e702dea77 100644 --- a/maintenance/purgeChangedFiles.php +++ b/maintenance/purgeChangedFiles.php @@ -177,7 +177,6 @@ class PurgeChangedFiles extends Maintenance { // Sanity check to avoid data loss $repo->getBackend()->delete( array( 'src' => $file->getPath() ) ); $this->verbose( "Deleted orphan file: {$file->getPath()}.\n" ); - } else { $this->error( "File was not deleted: {$file->getPath()}.\n" ); } @@ -185,7 +184,6 @@ class PurgeChangedFiles extends Maintenance { // Purge items from fileachive table (rows are likely here) $this->purgeFromArchiveTable( $repo, $file ); - } elseif ( $logType === 'move' ) { // Purge the target file as well @@ -232,7 +230,6 @@ class PurgeChangedFiles extends Maintenance { // Sanity check to avoid data loss $repo->getBackend()->delete( array( 'src' => $ofile->getPath() ) ); $this->output( "Deleted orphan file: {$ofile->getPath()}.\n" ); - } else { $this->error( "File was not deleted: {$ofile->getPath()}.\n" ); } @@ -244,6 +241,7 @@ class PurgeChangedFiles extends Maintenance { protected function getDeletedPath( LocalRepo $repo, LocalFile $file ) { $hash = $repo->getFileSha1( $file->getPath() ); $key = "{$hash}.{$file->getExtension()}"; + return $repo->getDeletedHashPath( $key ) . $key; } @@ -257,7 +255,6 @@ class PurgeChangedFiles extends Maintenance { $this->output( $msg ); } } - } $maintClass = "PurgeChangedFiles";