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

Diff of /rpms/e-smith-backup/sme7/e-smith-backup-1.15.0-add2general.patch

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

Revision 1.1 by snetram, Sun Apr 27 08:43:24 2008 UTC Revision 1.3 by slords, Mon Aug 4 13:54:17 2008 UTC
# Line 1  Line 1 
1  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  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  --- e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup        2008-08-04 07:45:33.000000000 -0600
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  +++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup      2008-08-04 07:45:17.000000000 -0600
4  @@ -154,10 +154,6 @@  @@ -158,10 +158,6 @@
5      <trans>Select an action</trans>      <trans>Select an action</trans>
6     </entry>     </entry>
7     <entry>     <entry>
# Line 12  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 12  diff -Nur -x '*.orig' -x '*.rej' e-smith
12      <base>X_BACKUP_OR_RESTORE</base>      <base>X_BACKUP_OR_RESTORE</base>
13      <trans>X Backup or restore server data</trans>      <trans>X Backup or restore server data</trans>
14     </entry>     </entry>
15  @@ -204,10 +200,6 @@  @@ -208,10 +204,6 @@
16      <trans>Backup file to restore from</trans>      <trans>Backup file to restore from</trans>
17     </entry>     </entry>
18     <entry>     <entry>
# Line 23  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 23  diff -Nur -x '*.orig' -x '*.rej' e-smith
23      <base>VERIFY_BACKUP_DESC</base>      <base>VERIFY_BACKUP_DESC</base>
24      <trans>      <trans>
25       <![CDATA[       <![CDATA[
26  @@ -615,10 +607,6 @@  @@ -273,10 +265,6 @@
27        <trans>Error occured while restoring initial group of 'www'.</trans>
28       </entry>
29       <entry>
30    -   <base>ERR_UPDATING_SYSCONF</base>
31    -   <trans>Error occurred while updating system configuration.</trans>
32    -  </entry>
33    -  <entry>
34        <base>RESTORE_FAILED</base>
35        <trans>Restore failed! The backup file was incomplete.</trans>
36       </entry>
37    @@ -619,10 +607,6 @@
38      </trans>      </trans>
39     </entry>     </entry>
40     <entry>     <entry>
# Line 35  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 46  diff -Nur -x '*.orig' -x '*.rej' e-smith
46      <trans>Backup workstation settings</trans>      <trans>Backup workstation settings</trans>
47     </entry>     </entry>
48  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  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
49  --- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-04-27 10:28:40.000000000 +0200  --- e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup 2008-08-04 07:45:33.000000000 -0600
50  +++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup       2008-04-27 10:27:46.000000000 +0200  +++ mezzanine_patched_e-smith-backup-1.15.0/root/etc/e-smith/web/functions/backup       2008-08-04 07:45:17.000000000 -0600
51  @@ -1326,7 +1326,7 @@  @@ -1326,7 +1326,7 @@
52          print $q->Tr(          print $q->Tr(
53                      esmith::cgi::genCell(                      esmith::cgi::genCell(
# Line 46  diff -Nur -x '*.orig' -x '*.rej' e-smith Line 57  diff -Nur -x '*.orig' -x '*.rej' e-smith
57                          ),                          ),
58    
59              esmith::cgi::genCell ($q, $q->textfield (-name  => 'backupwkPassword',              esmith::cgi::genCell ($q, $q->textfield (-name  => 'backupwkPassword',
60    @@ -2263,7 +2263,7 @@
61                    system("/usr/sbin/usermod", "-g", "$www_gid", "www") == 0
62                        or warn ($fm->localise('ERR_RESTORING_INITIAL_GRP')."\n");
63                    system("/sbin/e-smith/signal-event", "post-upgrade") == 0
64    -                   or die ($fm->localise('ERR_UPDATING_SYSCONF')."\n");
65    +                   or die ($fm->localise('ERROR_UPDATING_CONFIGURATION')."\n");
66                }
67                else
68                {

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed