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-04-18 18:34:57.847588106 +1000 |
3 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2006-04-18 18:31:49.351201334 +1000 |
4 |
|
|
@@ -224,7 +224,7 @@ |
5 |
|
|
</page> |
6 |
|
|
|
7 |
|
|
<page name="YUM_PAGE_POSTUPGRADE" |
8 |
|
|
- pre-event="turn_off_buttons()" |
9 |
|
|
+ pre-event="print_status_message()" |
10 |
|
|
post-event="post_upgrade_reboot()"> |
11 |
|
|
|
12 |
|
|
<field |
13 |
|
|
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 |
14 |
|
|
--- smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-04-18 18:34:57.848587933 +1000 |
15 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2006-04-18 18:34:46.765505564 +1000 |
16 |
|
|
@@ -217,18 +217,21 @@ |
17 |
|
|
$db->set_prop("yum", $_, join(',', ($q->param($_) ))); |
18 |
|
|
} |
19 |
|
|
|
20 |
|
|
- unless ( system( "/sbin/e-smith/signal-event", "yum-$function" ) == 0 ) |
21 |
|
|
- { |
22 |
|
|
- $fm->error('ERROR_UPDATING'); |
23 |
|
|
- return undef; |
24 |
|
|
- } |
25 |
|
|
+ my $system_status = system("/sbin/e-smith/signal-event", "yum-$function"); |
26 |
|
|
|
27 |
|
|
$db->reload; |
28 |
|
|
|
29 |
|
|
my $page = ($function eq 'modify') ? 'First' |
30 |
|
|
: 'YUM_PAGE_POSTUPGRADE'; |
31 |
|
|
|
32 |
|
|
- $fm->success('SUCCESS', $page); |
33 |
|
|
+ if ($system_status == 0) |
34 |
|
|
+ { |
35 |
|
|
+ $fm->success('SUCCESS', $page); |
36 |
|
|
+ } |
37 |
|
|
+ else |
38 |
|
|
+ { |
39 |
|
|
+ $fm->error('ERROR_UPDATING', $page); |
40 |
|
|
+ } |
41 |
|
|
} |
42 |
|
|
|
43 |
|
|
sub package_functions_enabled |