Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1035

Show
Ignore:
Timestamp:
03/07/08 01:27:20 (9 months ago)
Author:
rats
Message:

small patches ... still errors remaining in update script!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/engine/ispcp_common_methods.pl

    r1034 r1035  
    18541854sub store_conf { 
    18551855 
     1856    push_el(\@main::el, 'store_conf()', 'Starting...'); 
     1857 
     1858    my ($key, $value, $fline, $rs) = (undef, undef, undef, undef); 
     1859    my $rwith = undef; 
     1860        my $file_name = undef; 
     1861 
    18561862        if ( defined($_[0]) ) { 
    18571863                $file_name = $_[0]; 
    …… 
    18611867        } 
    18621868 
    1863     my ($key, $value, $fline, $rs) = (undef, undef, undef, undef); 
    1864     my $rwith = undef; 
    1865  
    1866     push_el(\@main::el, 'store_conf()', 'Starting...'); 
     1869 
    18671870 
    18681871    ($rs, $fline) = get_file($file_name); 

  • trunk/engine/setup/ispcp-update

    r1034 r1035  
    4848        VHCS247 => 1, 
    4949        VHCS248 => 2, 
    50         RC3           => 3, 
    51         RC4           => 4, 
     50        RC2           => 3, 
     51        RC3           => 4, 
    5252        }; 
    5353 
    …… 
    663663        $rs = update_conf($cfg_file); 
    664664        if ($rs != 0) { 
    665                 exit_werror("failed to get /etc/ispcp/ispcp.conf!"); 
     665                exit_werror("failed to get $cfg_file"); 
    666666        } 
    667667 
    …… 
    728728        push_el(\@main::el, 'patch_ispcp_rc3()', 'Ending...'); 
    729729 
     730        my ($rs, $rdata) = (undef, undef); 
     731 
    730732        print STDOUT "\tUpgrading system values ..."; 
    731733 
    732734        # update ispcp.conf 
    733         my $cfg_file = '/etc/ispcp/ispcp.conf'; 
     735        my $cfg_file = $main::cfg_file; 
    734736        $rs = update_conf($cfg_file); 
    735737        if ($rs != 0) { 
    736                 exit_werror("failed to get /etc/ispcp/ispcp.conf!"); 
     738                exit_werror("failed to get $cfg_file"); 
    737739        } 
    738740 
    …… 
    821823        } 
    822824        # ispCP 1.0.0 RC2/3 Update 
    823         elsif ($main::ua{'update'} ge RC2) { 
     825        elsif ($main::ua{'update'} >= RC2) { 
    824826                stop_services("/tmp/vhcs2-backup-all.lock"); 
    825827