sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 78118 by Jason Flatt for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 78118 by Jason Flatt for review
Date: Thu, 20 Apr 2006 17:10:03 +0100 (BST)

Change 78118 by jason_flatt@jason-jason on 2006/04/20 17:08:58

* PREPARE: Moved the backup warning to within the spell check.

Affected files ...

... //sgl/grimoires/test/collab/drupal/HISTORY#10 integrate
... //sgl/grimoires/test/collab/drupal/PREPARE#3 integrate

Differences ...

==== //sgl/grimoires/test/collab/drupal/HISTORY#10 (text) ====

@@ -4,6 +4,7 @@
* PREPARE, CONFIGURE, INSTALL: Added a check to see if Drupal is
already installed and to not ask first time configuration
questions if it is.
+ * PREPARE: Moved the backup warning to within the spell check.

2006-03-14 Jason Flatt <jflatt AT sourcemage.org>
* DETAILS: Security update to 4.6.6 (http://drupal.org/security).

==== //sgl/grimoires/test/collab/drupal/PREPARE#3 (xtext) ====

@@ -1,18 +1,18 @@
-message ""
-message "${WARNING_COLOR}Please make sure you have backed up your data and
configuration files before continuing with this installation."
-message ""
-message "Consider this to be your official warning.${DEFAULT_COLOR}"
-message ""
-
-if ! query "Are you comfortable with continuing the install?" n
-then
- return 1
-fi &&
-
-persistent_add DRUPAL_INSTALLED &&
+persistent_add DRUPAL_INSTALLED &&
if spell_ok ${SPELL}
then
DRUPAL_INSTALLED="y"
+
+ message ""
+ message "${WARNING_COLOR}Please make sure you have backed up your data and
configuration files before continuing with this installation."
+ message ""
+ message "Consider this to be your official warning.${DEFAULT_COLOR}"
+ message ""
+
+ if ! query "Are you comfortable with continuing the install?" n
+ then
+ return 1
+ fi
else
DRUPAL_INSTALLED="n"
fi

[SM-Commit] PERFORCE change 78118 by Jason Flatt for review, Perforce Review Daemon, 04/20/2006