/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum-2.6.2-bz12171_bz12209_no_reconfigure.patch
ViewVC logotype

Contents of /rpms/smeserver-yum/sme10/smeserver-yum-2.6.2-bz12171_bz12209_no_reconfigure.patch

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


Revision 1.1 - (show annotations) (download)
Mon Feb 27 08:57:26 2023 UTC (14 months, 2 weeks ago) by michel
Branch: MAIN
CVS Tags: smeserver-yum-2_6_2-5_el7_sme, smeserver-yum-2_6_2-3_el7_sme, smeserver-yum-2_6_2-4_el7_sme, HEAD
make: « clog » est à jour.

1 diff -urN smeserver-yum-2.6.2.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum smeserver-yum-2.6.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
2 --- smeserver-yum-2.6.2.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2022-07-11 19:10:46.000000000 +0400
3 +++ smeserver-yum-2.6.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2023-02-26 21:31:05.000000000 +0400
4 @@ -12,6 +12,11 @@
5 </entry>
6
7 <entry>
8 + <base>UPDATE_SUCCESS</base>
9 + <trans>The requested changes have been successfully implemented.</trans>
10 + </entry>
11 +
12 + <entry>
13 <base>LABEL_YUM_STATUS</base>
14 <trans>Check for updates</trans>
15 </entry>
16 diff -urN smeserver-yum-2.6.2.old/root/etc/e-smith/web/functions/yum smeserver-yum-2.6.2/root/etc/e-smith/web/functions/yum
17 --- smeserver-yum-2.6.2.old/root/etc/e-smith/web/functions/yum 2022-07-11 19:10:46.000000000 +0400
18 +++ smeserver-yum-2.6.2/root/etc/e-smith/web/functions/yum 2023-02-26 21:19:45.000000000 +0400
19 @@ -309,4 +309,13 @@
20 <subroutine src="print_button('RECONFIGURE')" />
21 </page>
22
23 + <page name="YUM_PAGE_NO_POSTUPGRADE"
24 + pre-event="print_status_message()"
25 + post-event="wherenext('First')">
26 +
27 + <subroutine src="display_yum_log()" />
28 +
29 + <subroutine src="print_button('NEXT')" />
30 + </page>
31 +
32 </form>
33 diff -urN smeserver-yum-2.6.2.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm smeserver-yum-2.6.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm
34 --- smeserver-yum-2.6.2.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2022-07-11 19:10:46.000000000 +0400
35 +++ smeserver-yum-2.6.2/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2023-02-26 21:21:30.000000000 +0400
36 @@ -390,12 +390,21 @@
37 {
38 my $fm = shift;
39
40 - $fm->success('HEADER_POSTUPGRADE_REQUIRED', 'YUM_PAGE_POSTUPGRADE');
41 -
42 - $fm->{cgi}->param(-name => "page", -value => 0);
43 - $fm->{cgi}->param(-name => "page_stack", -value => '');
44 - $fm->{cgi}->param(-name => "Next", -value => 'Next');
45 - $fm->{cgi}->param(-name => "wherenext", -value =>'YUM_PAGE_POSTUPGRADE');
46 + my $reconf = get_value($fm,"UnsavedChanges",'yes');
47 + if ( $reconf eq 'no' ) {
48 + $fm->success('UPDATE_SUCCESS');
49 + $fm->{cgi}->param(-name => "page", -value => 0);
50 + $fm->{cgi}->param(-name => "page_stack", -value => '');
51 + $fm->{cgi}->param(-name => "Next", -value => 'Next');
52 + $fm->{cgi}->param(-name => "wherenext", -value =>'YUM_PAGE_NO_POSTUPGRADE');
53 + } else {
54 +# effective reconfigure and reboot required
55 + $fm->success('HEADER_POSTUPGRADE_REQUIRED', 'YUM_PAGE_POSTUPGRADE');
56 + $fm->{cgi}->param(-name => "page", -value => 0);
57 + $fm->{cgi}->param(-name => "page_stack", -value => '');
58 + $fm->{cgi}->param(-name => "Next", -value => 'Next');
59 + $fm->{cgi}->param(-name => "wherenext", -value =>'YUM_PAGE_POSTUPGRADE');
60 + }
61 }
62
63 1;

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