View | Details | Raw Unified
Collapse All | Expand All

(-) /usr/bin/genlop.old (-2 / +6 lines)
 Lines 503-508    Link Here  
    # not check for sanity and have users check their FEATURES instead.
    # not check for sanity and have users check their FEATURES instead.
    my @targets      = ();
    my @targets      = ();
    my @sandbox_pids = qx{ps --no-header -o pid -C sandbox};
    my @sandbox_pids = qx{ps --no-header -o pid -C sandbox};
    my ($e_curmerge, $e_lastmerge);
 
    if (scalar @sandbox_pids == 0) {
    if (scalar @sandbox_pids == 0) {
        print colored("!!!", $COLORS{'red'});
        print colored("!!!", $COLORS{'red'});
        print " Error: no working merge found.\n";
        print " Error: no working merge found.\n";
 Lines 533-542    Link Here  
            my $handle;
            my $handle;
            open_file($logfile, \$handle);
            open_file($logfile, \$handle);
            foreach (<$handle>) {
            foreach (<$handle>) {
                if (m/^(.*?)\:  \>\>\> emerge .*?\)(.*?\/$ebuild_arg-[0-9].*?)to \//)
 
                if (m/^(.*?)\:  \>\>\> emerge \((.*?) of (.*?)\)(.*?\/$ebuild_arg-[0-9].*?)to \//)
 
                {
                {
                    $e_start   = $1;
                    $e_start   = $1;
                    $e_current = $2;
 
		    $e_curmerge = $2;
 

              
		    $e_lastmerge = $3;

            

            

              

              
                    $e_current = $4;

            

        
                }
                }

        
                if (m/^(.*?)\:  ::: completed .*?\) .*\/$ebuild_arg-[0-9].* to \//) {
                if (m/^(.*?)\:  ::: completed .*?\) .*\/$ebuild_arg-[0-9].* to \//) {

        
                    $e_end = $1;
                    $e_end = $1;

  

    

    

       Lines 548-553
       
    
  Link Here 
    

  

        
        }
        }

        
        $e_end = CORE::time();
        $e_end = CORE::time();

        
        &gtime($e_end - $e_start);
        &gtime($e_end - $e_start);

            

              
              
	print "\n Currently merging $e_curmerge out of $e_lastmerge\n";

            

        
        print colored("\n \*$e_current\n\n", $COLORS{'blue'});
        print colored("\n \*$e_current\n\n", $COLORS{'blue'});

        
        print "       current merge time: ";
        print "       current merge time: ";

        
        $current_found = undef;
        $current_found = undef;