/[smeserver]/rpms/e-smith-backup/sme8/e-smith-backup-1.14.0-fixerrmsg.patch
ViewVC logotype

Annotation of /rpms/e-smith-backup/sme8/e-smith-backup-1.14.0-fixerrmsg.patch

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


Revision 1.1.2.1 - (hide annotations) (download)
Tue Mar 25 17:36:53 2008 UTC (16 years, 7 months ago) by slords
Branch: e-smith-backup-1_14-tree
CVS Tags: e-smith-backup-1_14_0-24_el5_sme, e-smith-backup-1_14_0-25_el5_sme, e-smith-backup-1_14_0-26_el5_sme, e-smith-backup-1_14_0-23_el5_sme, e-smith-backup-1_14_0-21_el5_sme, e-smith-backup-1_14_0-22_el5_sme
Changes since 1.1: +63 -0 lines
* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.14.0-21
- Fix localization in restore routine [SME: 3989]

1 slords 1.1.2.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.14.0/root/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/web/functions/backup
2     --- e-smith-backup-1.14.0/root/etc/e-smith/web/functions/backup 2008-03-25 11:33:20.000000000 -0600
3     +++ mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/web/functions/backup 2008-03-25 11:33:02.000000000 -0600
4     @@ -110,7 +110,7 @@
5     {
6     if($rec)
7     {
8     - $msg = $fm->localise($rec->prop('errmsg') || '');
9     + $msg = $rec->prop('errmsg') || '';
10     $rec->delete_prop('errmsg');
11     }
12     }
13     @@ -1235,13 +1235,13 @@
14    
15     unless(system("/sbin/e-smith/signal-event", "pre-restore") == 0)
16     {
17     - $rec->set_prop('errmsg', 'ERR_PRE_RESTORE');
18     + $rec->set_prop('errmsg', $fm->localize('ERR_PRE_RESTORE'));
19     $rec->delete_prop('state');
20     die ($fm->localise('ERR_PRE_RESTORE'),"\n");
21     }
22     unless(system("/sbin/e-smith/signal-event", "restore-tape") == 0)
23     {
24     - $rec->set_prop('errmsg', 'ERR_RESTORING_FROM_TAPE');
25     + $rec->set_prop('errmsg', $fm->localize('ERR_RESTORING_FROM_TAPE'));
26     $rec->delete_prop('state');
27     die ($fm->localise('ERR_RESTORING_FROM_TAPE')."\n");
28     }
29     @@ -1252,19 +1252,20 @@
30    
31     unless(system("/usr/sbin/groupmod", "-g", "$www_gid", "www") == 0)
32     {
33     - $rec->set_prop('errmsg', $rec->prop('errmsg').'<br>ERR_RESTORING_GID');
34     + $rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'.
35     + $fm->localize('ERR_RESTORING_GID'));
36     warn ($fm->localise('ERR_RESTORING_GID')."\n");
37     }
38     unless(system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0)
39     {
40     - $rec->set_prop('errmsg', $rec->prop('errmsg').
41     - '<br>ERR_RESTORING_INITIAL_GRP');
42     + $rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'.
43     + $fm->localize('ERR_RESTORING_INITIAL_GRP'));
44     warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
45     }
46     unless(system("/sbin/e-smith/signal-event", "post-upgrade") == 0)
47     {
48     - $rec->set_prop('errmsg', $rec->prop('errmsg').
49     - 'ERR_UPDATING_CONF_AFTER_TAPE_RESTORE');
50     + $rec->set_prop('errmsg', $rec->prop('errmsg').'<br>'.
51     + $fm->localize('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE'));
52     $rec->delete_prop('state');
53     die ($fm->localise('ERR_UPDATING_CONF_AFTER_TAPE_RESTORE'));
54     }
55     @@ -1286,7 +1287,7 @@
56     # Error
57    
58     $rec->delete_prop('state');
59     - $rec->set_prop('errmsg', 'COULD_NOT_FORK');
60     + $rec->set_prop('errmsg', $fm->localize('COULD_NOT_FORK'));
61     die ($fm->localise("COULD_NOT_FORK")."$!\n");
62     }
63     }

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