/[smeserver]/rpms/e-smith-backup/sme7/e-smith-backup-1.14.0-add2general.patch
ViewVC logotype

Annotation of /rpms/e-smith-backup/sme7/e-smith-backup-1.14.0-add2general.patch

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

Revision 1.1.2.2 - (hide annotations) (download)
Mon Jul 28 21:08:24 2008 UTC (16 years, 3 months ago) by snetram
Branch: e-smith-backup-1_14-tree
Changes since 1.1.2.1: +52 -5 lines 
* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.0-25
- Backport patch to add common <base> tags to e-smith-formmagick's general [SME: 4286]
1 snetram 1.1.2.2 diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
2     --- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-04-27 10:28:40.000000000 +0200
3     +++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-04-27 10:26:13.000000000 +0200
4     @@ -154,10 +154,6 @@
5 slords 1.1.2.1 <trans>Select an action</trans>
6     </entry>
7     <entry>
8     - <base>PERFORM</base>
9     - <trans>Perform</trans>
10     - </entry>
11     - <entry>
12     <base>X_BACKUP_OR_RESTORE</base>
13     <trans>X Backup or restore server data</trans>
14     </entry>
15 snetram 1.1.2.2 @@ -204,10 +200,6 @@
16 slords 1.1.2.1 <trans>Backup file to restore from</trans>
17     </entry>
18     <entry>
19     - <base>RESTORE</base>
20     - <trans>Restore</trans>
21     - </entry>
22     - <entry>
23     <base>VERIFY_BACKUP_DESC</base>
24     <trans>
25     <![CDATA[
26 snetram 1.1.2.2 @@ -615,10 +607,6 @@
27     </trans>
28     </entry>
29     <entry>
30     - <base>WORKSTN_PASSWORD</base>
31     - <trans>Password</trans>
32     - </entry>
33     - <entry>
34     <base>WORKSTATION_BACKUP_DEST</base>
35     <trans>Backup workstation settings</trans>
36     </entry>
37     diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup
38     --- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-04-27 10:28:40.000000000 +0200
39     +++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-04-27 10:27:46.000000000 +0200
40     @@ -1326,7 +1326,7 @@
41     print $q->Tr(
42     esmith::cgi::genCell(
43     $q,
44     - $fm->localise('WORKSTN_PASSWORD')
45     + $fm->localise('PASSWORD')
46     ),
47    
48     esmith::cgi::genCell ($q, $q->textfield (-name => 'backupwkPassword',
49     --- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup.add2general2 2008-07-07 19:31:53.000000000 +0200
50     +++ e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-07-07 19:34:51.000000000 +0200
51     @@ -2263,7 +2263,7 @@
52     system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0
53     or warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
54     system("/sbin/e-smith/signal-event", "post-upgrade") == 0
55     - or die ($fm->localise('ERR_UPDATING_SYSCONF')."\n");
56     + or die ($fm->localise('ERROR_UPDATING_CONFIGURATION')."\n");
57     }
58     else
59     {
60     --- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup.add2general2 2008-07-07 19:31:53.000000000 +0200
61     +++ e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2008-07-07 19:33:20.000000000 +0200
62     @@ -261,10 +261,6 @@
63     <trans>Error occured while restoring initial group of 'www'.</trans>
64     </entry>
65     <entry>
66     - <base>ERR_UPDATING_SYSCONF</base>
67     - <trans>Error occurred while updating system configuration.</trans>
68     - </entry>
69     - <entry>
70     <base>RESTORE_FAILED</base>
71     <trans>Restore failed! The backup file was incomplete.</trans>
72     </entry>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed