1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade |
2 |
--- smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-09-30 23:25:28.000000000 -0500 |
3 |
+++ mezzanine_patched_smeserver-nag-2.3/root/etc/e-smith/events/actions/nag_upgrade 2008-09-30 23:23:21.000000000 -0500 |
4 |
@@ -144,13 +144,37 @@ |
5 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
6 |
} |
7 |
|
8 |
+unless (defined $nag_shares->{share_owner}) |
9 |
+{ |
10 |
+ # We need to be careful about this one as it will fail if the |
11 |
+ # column exists, so we check the error. |
12 |
+ my $statement = |
13 |
+ "ALTER TABLE nag_shares CHANGE share_owner share_owner ". |
14 |
+ "VARCHAR(255)"; |
15 |
+ $statement = $db_naghandle->prepare($statement) or |
16 |
+ die "prepare: $$statement: $DBI::errstr"; |
17 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
18 |
+} |
19 |
+ |
20 |
+unless (defined $nag_shares_users->{user_uid}) |
21 |
+{ |
22 |
+ # We need to be careful about this one as it will fail if the |
23 |
+ # column exists, so we check the error. |
24 |
+ my $statement = |
25 |
+ "ALTER TABLE nag_shares_users CHANGE user_uid user_uid ". |
26 |
+ "VARCHAR(255)"; |
27 |
+ $statement = $db_naghandle->prepare($statement) or |
28 |
+ die "prepare: $$statement: $DBI::errstr"; |
29 |
+ $statement->execute or die "execute: $$statement: $DBI::errstr"; |
30 |
+} |
31 |
+ |
32 |
unless (defined $nag_shares_groups->{group_uid}) |
33 |
{ |
34 |
# We need to be careful about this one as it will fail if the |
35 |
# column exists, so we check the error. |
36 |
my $statement = |
37 |
- "ALTER TABLE nag_shares_groups ADD group_uid VARCHAR(255) ". |
38 |
- "NOT NULL"; |
39 |
+ "ALTER TABLE nag_shares_groups CHANGE group_uid group_uid ". |
40 |
+ "VARCHAR(255)"; |
41 |
$statement = $db_naghandle->prepare($statement) or |
42 |
die "prepare: $$statement: $DBI::errstr"; |
43 |
$statement->execute or die "execute: $$statement: $DBI::errstr"; |
44 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql |
45 |
--- smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-09-30 23:25:28.000000000 -0500 |
46 |
+++ mezzanine_patched_smeserver-nag-2.3/root/home/httpd/html/horde/smeserver/nag.sql 2008-09-30 23:24:53.000000000 -0500 |
47 |
@@ -1,4 +1,4 @@ |
48 |
--- $Horde: nag/scripts/sql/nag.sql,v 1.4.8.5 2008/04/29 19:33:22 chuck Exp $ |
49 |
+-- $Horde: nag/scripts/sql/nag.sql,v 1.4.8.7 2008/09/23 15:18:22 jan Exp |
50 |
|
51 |
CREATE TABLE IF NOT EXISTS nag_tasks ( |
52 |
task_id VARCHAR(32) NOT NULL, |