Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80600 by Jason Flatt for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "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>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "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 80600 by Jason Flatt for review
  • Date: Tue, 13 Jun 2006 17:00:01 +0100 (BST)

Change 80600 by jason_flatt@jason-jason on 2006/06/13 17:00:00

Fix for bug # 11266.

Affected files ...

... //sgl/grimoires/test/collab/drupal/CONFIGURE#5 integrate
... //sgl/grimoires/test/collab/drupal/HISTORY#12 integrate
... //sgl/grimoires/test/collab/drupal/PREPARE#5 integrate

Differences ...

==== //sgl/grimoires/test/collab/drupal/CONFIGURE#5 (xtext) ====

@@ -8,6 +8,14 @@
mysql
\
postgresql
&&

+persistent_add DRUPAL_INSTALLED
&&
+if spell_ok ${SPELL}
+then
+ DRUPAL_INSTALLED="y"
+else
+ DRUPAL_INSTALLED="n"
+fi
&&
+
if [ "${DRUPAL_INSTALLED}" == "n" ]
then
persistent_add DRUPAL_CREATEDB DRUPAL_CONFIGURE
&&

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

@@ -1,9 +1,14 @@
2006-06-13 Jason Flatt <jflatt AT sourcemage.org>
+ * CONFIGURE: Added check for existing install that was in PREPARE.
+ * FINAL: Added check for Drupal version before displaying message.
* INSTALL: Modified the parts that create the database and modify the
settings.php file to take into account the two Drupal versions and
the two possible database choices.
* PREPARE: Changed the order for version install so that the more
current version is the default.
+ Removed warning and automatic exit so spell will complete it's cast
+ (for bug # 11266).
+ Removed check for existing install.

2006-06-08 John Harding <johnh AT kuberaconsulting.com>
* DETAILS: Security update, added if statement to allow choice between
@@ -31,7 +36,7 @@
2006-02-26 Jason Flatt <jflatt AT sourcemage.org>
* CONFIGURE, INSTALL: Added user options and variables for database
name, user, host and password.
- Removed persisntant_add'ed variables in CONFIGURE in favor of using
+ Removed persistant_add'ed variables in CONFIGURE in favor of using
existing variables for INSTALL.
Added the option for automatically updating the Drupal configuration
file (sites/default/settings/php).

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

@@ -1,23 +1,4 @@
config_query_list DRUPAL_VER
\
"Do you wish to install the newer (4.7) or older (4.6)
version of Drupal (both are considered stable)?" \
"newer"
\
- "older"
&&
-
-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
+ "older"



  • [SM-Commit] PERFORCE change 80600 by Jason Flatt for review, Perforce Review Daemon, 06/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page