r65697 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r65696‎ | r65697 | r65698 >
Date:16:12, 30 April 2010
Author:avar
Status:ok
Tags:
Comment:
Be more helpful when we can't create the `data' directory for SQLite

Display a list of commands needed to create the directory, similar to
what we do when we can't write to config/

Removed the corresponding Dutch translation as part of the
commit. It's now out of date.
Modified paths:
  • /branches/new-installer/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /branches/new-installer/phase3/includes/installer/SqliteInstaller.php (modified) (history)

Diff [purge]

Index: branches/new-installer/phase3/includes/installer/Installer.i18n.php
@@ -206,8 +206,12 @@
207207 'config-sqlite-name-help' => 'Choose a name that identifies your wiki.
208208 Do not use spaces or hyphens.
209209 This will be used for the SQLite data file name.',
210 - 'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1", because the parent directory "$2" is not writable by the webserver.
211 -Create this directory yourself, make it writable, and try again.',
 210+ 'config-sqlite-parent-unwritable' => 'Cannot create the data directory "$1" automatically, because the parent directory "$2" is not writable by the webserver.
 211+
 212+To make the directory on a Unix/Linux system:
 213+<pre>cd $2
 214+mkdir $3
 215+chmod a+w $3</pre>',
212216 'config-sqlite-mkdir-error' => 'Error creating the data directory "$1".
213217 Check the location and try again.',
214218 'config-sqlite-dir-unwritable' => 'Unable to write to the directory "$1".
@@ -573,8 +577,6 @@
574578 'config-sqlite-name-help' => 'Kies een naam die uw wiki identificeert.
575579 Gebruik geen spaties of koppeltekens.
576580 Deze naam wordt gebruikt voor het gegevensbestands van SQLite.',
577 - 'config-sqlite-parent-unwritable' => 'Het was niet mogelijk de gegevensmap "$1" aan te maken omdat in de bovenliggende map "$2" niet geschreven kan worden door de webserver.
578 -Maak deze map aan, zorg dat de webserver erin kan schrijven en probeer het opnieuw.',
579581 'config-sqlite-mkdir-error' => 'Er is een fout opgetreden bij het aanmaken van de gegevensmap "$1".
580582 Controleer de locatie en probeer het opnieuw.',
581583 'config-sqlite-dir-unwritable' => 'Het was niet mogelijk in de map "$1" te schrijven.
Index: branches/new-installer/phase3/includes/installer/SqliteInstaller.php
@@ -46,7 +46,7 @@
4747 $this->setVar( 'wgSQLiteDataDir', $dir );
4848 if ( !is_dir( $dir ) ) {
4949 if ( !is_writable( dirname( $dir ) ) ) {
50 - return Status::newFatal( 'config-sqlite-parent-unwritable', $dir, dirname( $dir ) );
 50+ return Status::newFatal( 'config-sqlite-parent-unwritable', $dir, dirname( $dir ), basename( $dir ) );
5151 }
5252 wfSuppressWarnings();
5353 $ok = wfMkdirParents( $dir, 0700 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r65706Use Installer::maybeGetWebserverPrimaryGroup() for SQLite's data directory...avar18:20, 30 April 2010

Status & tagging log