Eventum

Merge lp:~porten-deactivatedaccount/eventum/devel into lp:eventum

  1. devel
  2. Merge into trunk
Proposed by Harri Porten
Status: Merged
Merged at revision: 4237
Proposed branch: lp:~porten-deactivatedaccount/eventum/devel
Merge into: lp:eventum
Diff against target: 46 lines (+9/-3)
2 files modified
docs/UPGRADE (+7/-1)
upgrade/v1.7.1_to_v2.0/upgrade_config.php (+2/-2)
To merge this branch: bzr merge lp:~porten-deactivatedaccount/eventum/devel
Reviewer Review Type Date Requested Status
Eventum Development Team Pending
Review via email: mp+44880@code.launchpad.net

Description of the change

The script upgrading an installation from 1.7.1 to 2.0 was not working anymore after
the recent directory restructuring.

With this change applied we were able to perform an upgrade from 1.7.1 to 2.3
in one go using a 2.3 source package.

To post a comment you must log in.
lp:~porten-deactivatedaccount/eventum/devel updated
4237. By Elan Ruusamäe

merge req #44880

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/UPGRADE'
2--- docs/UPGRADE 2010-04-21 16:07:51 +0000
3+++ docs/UPGRADE 2010-12-30 00:08:36 +0000
4@@ -62,13 +62,19 @@
5 - Upgrading from version 1.7.1 to 2.0:
6 ----------------------------------------
7
8+This upgrade will move some configuration files to the new config/
9+directory. To let the scripts locate the old configuration copy the
10+files config.inc.php, setup.conf.php and include/private_key.php
11+to /path-to-eventum/ and /path-to-eventum/include, respectively.
12+The latter directory needs to be created with mkdir first.
13+
14 cd /path-to-eventum/upgrade/v1.7.1_to_v2.0/
15 php upgrade_config.php
16 php database_changes.php
17
18 If you had the IRC bot configured you will have to copy your old
19 config from misc/irc/bot.php to config/irc_config.php. An example
20-config file is located in setup/irc_config.php
21+config file is located in htdocs/setup/irc_config.php
22
23 - Upgrading from version 1.7.0 to 1.7.1:
24 ----------------------------------------
25
26=== modified file 'upgrade/v1.7.1_to_v2.0/upgrade_config.php'
27--- upgrade/v1.7.1_to_v2.0/upgrade_config.php 2010-03-16 18:28:36 +0000
28+++ upgrade/v1.7.1_to_v2.0/upgrade_config.php 2010-12-30 00:08:36 +0000
29@@ -1,7 +1,7 @@
30 <?php
31 // upgrade the config.inc.php file
32
33-define('APP_PATH', realpath(dirname(__FILE__) . '/../../../') . '/');
34+define('APP_PATH', realpath(dirname(__FILE__) . '/../../') . '/');
35 define('APP_CONFIG_PATH', APP_PATH . '/config/');
36
37 if (!is_writable(APP_PATH . '/config/')) {
38@@ -20,7 +20,7 @@
39 // read old file and parse out needed values
40 $old_config = file_get_contents(APP_PATH . "/config.inc.php");
41
42-$config_contents = implode("", file(APP_PATH . "/setup/config.php"));
43+$config_contents = implode("", file(APP_PATH . "/htdocs/setup/config.php"));
44 $config_contents = str_replace("%{APP_SQL_DBHOST}%", get_old_value('APP_SQL_DBHOST'), $config_contents);
45 $config_contents = str_replace("%{APP_SQL_DBNAME}%", get_old_value('APP_SQL_DBNAME'), $config_contents);
46 $config_contents = str_replace("%{APP_SQL_DBUSER}%", get_old_value('APP_SQL_DBUSER'), $config_contents);

Subscribers

People subscribed via source and target branches