https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18768
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #3 from Alex Buckley <[email protected]> --- Hi Kyle Can you please rebase, as you can see the patches are not applying cleanly on master: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 18768 - Convert logic in sip_cli_emulator to a reusable library Applying: Bug 18768 - Add support for authenticating against external SIP servers ala LDAP and CAS /home/vagrant/kohaclone/.git/rebase-apply/patch:360: trailing whitespace. Make sure that ALL required fields are populated by your LDAP database (and mapped in KOHA_CONF). /home/vagrant/kohaclone/.git/rebase-apply/patch:401: trailing whitespace. Once a user has been accepted by the LDAP server, there are several possibilities for how Koha will behave, depending on /home/vagrant/kohaclone/.git/rebase-apply/patch:417: trailing whitespace. their SIP password OR their local one. If this is a problem, then you should enable update and supply a mapping for warning: 3 lines add whitespace errors. Using index info to reconstruct a base tree... M C4/Auth.pm <stdin>:360: trailing whitespace. Make sure that ALL required fields are populated by your LDAP database (and mapped in KOHA_CONF). <stdin>:401: trailing whitespace. Once a user has been accepted by the LDAP server, there are several possibilities for how Koha will behave, depending on <stdin>:417: trailing whitespace. their SIP password OR their local one. If this is a problem, then you should enable update and supply a mapping for warning: 3 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Failed to merge in the changes. Patch failed at 0001 Bug 18768 - Add support for authenticating against external SIP servers ala LDAP and CAS The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-18768---Add-support-for-authenticating-against-rU5kes.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
