/[smeserver]/rpms/smeserver-yum/sme8/smeserver-yum-1.2.0-DisplayStatus.patch
ViewVC logotype

Contents of /rpms/smeserver-yum/sme8/smeserver-yum-1.2.0-DisplayStatus.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (show annotations) (download)
Tue Oct 7 14:47:50 2008 UTC (16 years ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
Error occurred while calculating annotation data.
FILE REMOVED
New streams

1 diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/events/actions/yum-action mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/events/actions/yum-action
2 --- smeserver-yum-1.2.0/root/etc/e-smith/events/actions/yum-action 2006-03-16 17:22:21.000000000 +1100
3 +++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/events/actions/yum-action 2006-04-18 15:54:47.767826133 +1000
4 @@ -34,6 +34,12 @@
5 die "Unknown function $function\n"
6 unless ($function =~ /install|update|remove/);
7
8 +my $log_file = "/var/log/yum/yum.log." . time();
9 +$db->set_prop('yum', 'LogFile', $log_file);
10 +
11 +open STDOUT, '>', "$log_file" or die "Can't redirect STDOUT: $!";
12 +open STDERR, ">&STDOUT" or die "Can't dup STDOUT: $!";
13 +
14 # XXX - FIXME - For groupremove, we need to do a grouplist on the group
15 # and then work out what to do
16
17 diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum
18 --- smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2006-03-16 17:22:21.000000000 +1100
19 +++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2006-04-18 15:43:23.590277961 +1000
20 @@ -8,7 +8,7 @@
21 #
22 # copyright (C) 1999-2005 Mitel Networks Corporation
23 # copyright (C) 2004 Shad L. Lords <slords@mail.com>
24 -# copyright (C) 2005 Gordon Rowell <gordonr@gormand.com.au>
25 +# copyright (C) 2005-2006 Gordon Rowell <gordonr@gormand.com.au>
26 # Copyright (c) 2003-2004 Darrell May <dmay@myezserver.com>
27 #
28 # This program is free software; you can redistribute it and/or modify
29 @@ -224,14 +224,16 @@
30 </page>
31
32 <page name="YUM_PAGE_POSTUPGRADE"
33 - pre-event="turn_off_buttons"
34 - post-event="post_upgrade_reboot">
35 + pre-event="turn_off_buttons()"
36 + post-event="post_upgrade_reboot()">
37
38 <field
39 type="literal">
40 <description>HEADER_POSTUPGRADE_REQUIRED</description>
41 </field>
42
43 + <subroutine src="display_yum_log()" />
44 +
45 <subroutine src="print_button('POST_UPGRADE')" />
46 </page>
47
48 diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm mezzanine_patched_smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm
49 --- smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-03-16 17:22:21.000000000 +1100
50 +++ mezzanine_patched_smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-04-18 16:00:50.397214134 +1000
51 @@ -223,6 +223,8 @@
52 return undef;
53 }
54
55 + $db->reload;
56 +
57 my $page = ($function eq 'modify') ? 'First'
58 : 'YUM_PAGE_POSTUPGRADE';
59
60 @@ -280,4 +282,22 @@
61
62 $fm->success('SYSTEM_BEING_RECONFIGURED');
63 }
64 +
65 +sub display_yum_log
66 +{
67 + my $fm = shift;
68 +
69 + my $yum_log = $db->get_prop_and_delete('yum', 'LogFile');
70 +
71 + return unless $yum_log and -f $yum_log;
72 +
73 + open my $log_file, "<", $yum_log or die "Couldn't open $yum_log\n";
74 + print "<PRE>";
75 + print <$log_file>;
76 + print "</PRE>";
77 + close $log_file or die "Failed to close $yum_log\n";
78 +
79 + return;
80 +}
81 +
82 1;

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed