[Koha-bugs] [Bug 26067] Member email validation based on MX record

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26067

Mazen Khallaf <mazen.i.khallaf at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mazen.i.khallaf at gmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #18 from Mazen Khallaf <mazen.i.khallaf at gmail.com> ---
Could not apply the patch in step 6.

$ git bz apply 26067
Bug 26067 - Member email validation based on MX record

108932 - Bug 26067: Member email validation based on MX record.

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26067: Member email validation based on MX record.
.git/rebase-apply/patch:46: trailing whitespace.
            - "email address entered on patron self registration to pass Mail
Exchange (MX) record check." 
.git/rebase-apply/patch:76: trailing whitespace.
            push(@invalidFields, "mxrecord_email") if ( !Email::Valid->address(
-address => $borrower->{'email'}, -mxcheck => 1));    
.git/rebase-apply/patch:86: trailing whitespace.
            push(@invalidFields, "mxrecord_emailpro") if
(!Email::Valid->address( -address => $borrower->{'emailpro'}, -mxcheck => 1)); 
.git/rebase-apply/patch:94: trailing whitespace.
            push(@invalidFields, "mxrecord_b_email") if
(!Email::Valid->address( -address => $borrower->{'B_email'}, -mxcheck => 1)); 
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
A       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
M       opac/opac-memberentry.pl
.git/rebase-apply/patch:46: trailing whitespace.
            - "email address entered on patron self registration to pass Mail
Exchange (MX) record check." 
.git/rebase-apply/patch:76: trailing whitespace.
            push(@invalidFields, "mxrecord_email") if ( !Email::Valid->address(
-address => $borrower->{'email'}, -mxcheck => 1));    
.git/rebase-apply/patch:86: trailing whitespace.
            push(@invalidFields, "mxrecord_emailpro") if
(!Email::Valid->address( -address => $borrower->{'emailpro'}, -mxcheck => 1)); 
.git/rebase-apply/patch:94: trailing whitespace.
            push(@invalidFields, "mxrecord_b_email") if
(!Email::Valid->address( -address => $borrower->{'B_email'}, -mxcheck => 1)); 
warning: 4 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-memberentry.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/mandatory/sysprefs.sql
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26067: Member email validation based on MX record.
The copy of the patch that failed is found in: .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-26067-Member-email-validation-based-on-MX-reco-EGPSaM.patch

-- 
You are receiving this mail because:
You are watching all bug changes.