dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Stop overwriting $cache in User::getCacheKey()"
[lhc/web/wiklou.git]
/
maintenance
/
hhvm
/
makeRepo.php
diff --git
a/maintenance/hhvm/makeRepo.php
b/maintenance/hhvm/makeRepo.php
index
2a102b2
..
cef0dad
100644
(file)
--- a/
maintenance/hhvm/makeRepo.php
+++ b/
maintenance/hhvm/makeRepo.php
@@
-95,9
+95,9
@@
class HHVMMakeRepo extends Maintenance {
print "Found " . count( $files ) . " files in " .
count( $dirs ) . " directories\n";
print "Found " . count( $files ) . " files in " .
count( $dirs ) . " directories\n";
- $tmpDir = wfTempDir() . '/mw-make-repo' . mt_rand( 0, 1
<<
31 );
+ $tmpDir = wfTempDir() . '/mw-make-repo' . mt_rand( 0, 1
<<
31 );
if ( !mkdir( $tmpDir ) ) {
if ( !mkdir( $tmpDir ) ) {
- $this->
error( 'Unable to create temporary directory', 1
);
+ $this->
fatalError( 'Unable to create temporary directory'
);
}
file_put_contents( "$tmpDir/file-list", implode( "\n", $files ) );
}
file_put_contents( "$tmpDir/file-list", implode( "\n", $files ) );
@@
-119,11
+119,11
@@
class HHVMMakeRepo extends Maintenance {
passthru( $cmd, $ret );
if ( $ret ) {
$this->cleanupTemp( $tmpDir );
passthru( $cmd, $ret );
if ( $ret ) {
$this->cleanupTemp( $tmpDir );
- $this->
error( "Error: HHVM returned error code $ret", 1
);
+ $this->
fatalError( "Error: HHVM returned error code $ret"
);
}
if ( !rename( "$tmpDir/hhvm.hhbc", $this->getOption( 'output' ) ) ) {
$this->cleanupTemp( $tmpDir );
}
if ( !rename( "$tmpDir/hhvm.hhbc", $this->getOption( 'output' ) ) ) {
$this->cleanupTemp( $tmpDir );
- $this->
error( "Error: unable to rename output file", 1
);
+ $this->
fatalError( "Error: unable to rename output file"
);
}
$this->cleanupTemp( $tmpDir );
return 0;
}
$this->cleanupTemp( $tmpDir );
return 0;
@@
-157,5
+157,5
@@
class HHVMMakeRepo extends Maintenance {
}
}
}
}
-$maintClass =
'HHVMMakeRepo'
;
+$maintClass =
HHVMMakeRepo::class
;
require RUN_MAINTENANCE_IF_MAIN;
require RUN_MAINTENANCE_IF_MAIN;