Changeset 468


Ignore:
Timestamp:
05/10/16 01:19:23 (2 years ago)
Author:
nanardon
Message:

Fix conflict

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tools/trunk/bin/sophie_load

    r466 r468  
    4646        my $res = $xmlcli->send_request('admin.load_distrib', $string); 
    4747        print $res->value . "\n"; 
     48        require Data::Dumper; 
     49        print Data::Dumper::Dumper($res); 
    4850    } 
    4951} else { 
  • web/lib/Sophie/Controller/Admin.pm

    r467 r468  
    303303sub add_meta_path : XMLRPC { 
    304304    my ($self, $c, $distrib, $meta, $type, $data) = @_; 
     305    warn "$distrib, $meta, $type"; 
    305306 
    306307    my ($dist) =  
     
    388389    } 
    389390 
    390     #$c->model('Base')->storage->dbh->rollback; 
     391    $c->model('Base')->storage->dbh->commit; 
    391392} 
    392393 
Note: See TracChangeset for help on using the changeset viewer.