https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39007 Alex Buckley <alexbuckley@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexbuckley@catalyst.net.nz --- Comment #16 from Alex Buckley <alexbuckley@catalyst.net.nz> --- Hi all, We are getting a sushi error on jenkins ( https://jenkins.koha-community.org/job/Koha_Sec/job/Koha_24.05/lastCompleted... ) and we have been told to apply this patchfix. When we apply it is not applying cleanly, see below: kohadev-koha@kohadevbox:koha((a5afd9c9c8b...)|AM 1/1)$ sed -n '/<<<<</,/>>>>>/p' t/db_dependent/api/v1/erm_sushi_services.t <<<<<<< HEAD is( scalar(@new_fields_in_response), 0, 'The response fields match the expected fields' ); ======= my $new_fields_string = "This is not a new error within Koha, the following new field(s) have been added to the API repsonse: " . join( ', ', @new_fields_in_response ) . '. They should be added to the API definition'; warning_like { scalar(@new_fields_in_response) } 0, $new_fields_string; $schema->storage->txn_rollback;
> Bug 39007: Update API spec and unit test
The difference is the $schema->storage->txn_rollback; line which is introduced by bug 37898 Could someone please rebase for 24.05 or advise what I should do? Thanks, Alex -- You are receiving this mail because: You are watching all bug changes.