/[smeserver]/rpms/smeserver-yum/sme7/smeserver-yum-1.2.0-reconfigurepage.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme7/smeserver-yum-1.2.0-reconfigurepage.patch

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


Revision 1.1 - (hide annotations) (download)
Tue Jun 12 17:41:55 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-yum-1_2_0-54_el4_sme, smeserver-yum-1_2_0-57_el4_sme, smeserver-yum-1_2_0-50_el4_sme, smeserver-yum-1_2_0-55_el4_sme, smeserver-yum-1_2_0-41_el4_sme, smeserver-yum-1_2_0-53_el4_sme, smeserver-yum-1_2_0-58_el4_sme, smeserver-yum-1_2_0-56_el4_sme, smeserver-yum-1_2_0-46_el4_sme, smeserver-yum-1_2_0-48_el4_sme, smeserver-yum-1_2_0-39_el4_sme, smeserver-yum-1_2_0-36_el4_sme, smeserver-yum-1_2_0-51_el4_sme, smeserver-yum-1_2_0-45_el4_sme, smeserver-yum-1_2_0-40_el4_sme, smeserver-yum-1_2_0-47_el4_sme, smeserver-yum-1_2_0-37_el4_sme, smeserver-yum-1_2_0-49_el4_sme, smeserver-yum-1_2_0-44_el4_sme
Import on branch sme7 of package smeserver-yum-1.2.0-36.el4.sme.src.rpm

1 slords 1.1 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
2     --- smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2006-11-21 12:18:06.156161003 +1100
3     +++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2006-11-21 12:00:32.593663306 +1100
4     @@ -42,12 +42,7 @@
5    
6     if ($f->get_prop('yum', 'LogFile'))
7     {
8     - $f->success('HEADER_POSTUPGRADE_REQUIRED', 'YUM_PAGE_POSTUPGRADE');
9     -
10     - $f->{cgi}->param(-name => "page", -value => 0);
11     - $f->{cgi}->param(-name => "page_stack", -value => '');
12     - $f->{cgi}->param(-name => "Next", -value => 'Next');
13     - $f->{cgi}->param(-name => "wherenext", -value =>'YUM_PAGE_POSTUPGRADE');
14     + $f->skip_to_postupgrade();
15     }
16    
17     $f->display();
18     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
19     --- smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-11-21 12:18:06.154161352 +1100
20     +++ mezzanine_patched_smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-11-21 12:15:11.454589327 +1100
21     @@ -322,9 +322,15 @@
22     {
23     my $fm = shift;
24    
25     - $db->delete_prop('yum', 'LogFile');
26     + $db->get_prop_and_delete('yum', 'LogFile');
27    
28     - system( "( /sbin/e-smith/signal-event post-upgrade ; /sbin/e-smith/signal-event reboot ) &" );
29     + $db->reload;
30     +
31     + if (fork == 0)
32     + {
33     + exec "/sbin/e-smith/signal-event post-upgrade; /sbin/e-smith/signal-event reboot";
34     + die "Exec failed";
35     + }
36    
37     $fm->success('SYSTEM_BEING_RECONFIGURED');
38     }
39     @@ -346,4 +352,17 @@
40     return;
41     }
42    
43     +sub skip_to_postupgrade
44     +{
45     + my $fm = shift;
46     +
47     + $db->get_prop_and_delete("yum", "LogFile");
48     + $fm->success('HEADER_POSTUPGRADE_REQUIRED', 'YUM_PAGE_POSTUPGRADE');
49     +
50     + $fm->{cgi}->param(-name => "page", -value => 0);
51     + $fm->{cgi}->param(-name => "page_stack", -value => '');
52     + $fm->{cgi}->param(-name => "Next", -value => 'Next');
53     + $fm->{cgi}->param(-name => "wherenext", -value =>'YUM_PAGE_POSTUPGRADE');
54     +}
55     +
56     1;

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