[Koha-bugs] [Bug 12285] Allow easy printing of patron's fines

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

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

Lisette Scheer <lisettepalouse+koha at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #33 from Lisette Scheer <lisettepalouse+koha at gmail.com> ---
Patch Failed to apply.

TASK [Apply bug 12285 via git-bz in docker container]
**************************
fatal: [localhost -> koha-fineprint]: FAILED! => {"changed": true, "cmd": "cd
/kohadevbox/koha && yes | git bz apply 12285", "delta": "0:00:04.819270",
"end": "2022-08-11 16:05:34.779629", "msg": "non-zero return code", "rc": 1,
"start": "2022-08-11 16:05:29.960359", "stderr": "error: Failed to merge in the
changes.\nhint: Use 'git am --show-current-patch=diff' to see the failed
patch\nPatch left in
/tmp/Bug-12285-Allow-easy-printing-of-patrons-fines-MrApna.patch",
"stderr_lines": ["error: Failed to merge in the changes.", "hint: Use 'git am
--show-current-patch=diff' to see the failed patch", "Patch left in
/tmp/Bug-12285-Allow-easy-printing-of-patrons-fines-MrApna.patch"], "stdout":
"Applying: Bug 12285: Allow easy printing of patron's fines.\nUsing index info
to reconstruct a base
tree...\nM\tC4/Members.pm\nM\tinstaller/data/mysql/en/mandatory/sample_notices.yml\nM\tkoha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc\nM\tkoha-tmpl/intranet-tmpl/prog/js/members-menu.js\nFalling
back to patching base and 3-way merge...\nAuto-merging
koha-tmpl/intranet-tmpl/prog/js/members-menu.js\nAuto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc\nAuto-merging
installer/data/mysql/en/mandatory/sample_notices.yml\nCONFLICT (content): Merge
conflict in installer/data/mysql/en/mandatory/sample_notices.yml\nAuto-merging
C4/Members.pm\nPatch failed at 0001 Bug 12285: Allow easy printing of patron's
fines.\nWhen you have resolved this problem run \"git bz apply
--continue\".\nIf you would prefer to skip this patch, instead run \"git bz
apply --skip\".\nTo restore the original branch and stop patching run \"git bz
apply --abort\".\n\nBug 12285 - Allow easy printing of patron's fines\n\n129944
- Bug 12285: Allow easy printing of patron's fines.\n129945 - Bug 12285: Fix QA
issues\n129946 - Bug 12285: Use accountlines date if issue is not found\n129947
- Bug 12285: (follow-up) Correct extra quote in yml file\n133112 - Bug 12285:
Don't print fines with undef amountoutstanding\n133147 - Bug 12285: Determine
patrons preferred languge\n\nApply? [(y)es, (n)o, (i)nteractive] ",
"stdout_lines": ["Applying: Bug 12285: Allow easy printing of patron's fines.",
"Using index info to reconstruct a base tree...", "M\tC4/Members.pm",
"M\tinstaller/data/mysql/en/mandatory/sample_notices.yml",
"M\tkoha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc",
"M\tkoha-tmpl/intranet-tmpl/prog/js/members-menu.js", "Falling back to patching
base and 3-way merge...", "Auto-merging
koha-tmpl/intranet-tmpl/prog/js/members-menu.js", "Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc", "Auto-merging
installer/data/mysql/en/mandatory/sample_notices.yml", "CONFLICT (content):
Merge conflict in installer/data/mysql/en/mandatory/sample_notices.yml",
"Auto-merging C4/Members.pm", "Patch failed at 0001 Bug 12285: Allow easy
printing of patron's fines.", "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\".", "", "Bug 12285 - Allow easy printing of
patron's fines", "", "129944 - Bug 12285: Allow easy printing of patron's
fines.", "129945 - Bug 12285: Fix QA issues", "129946 - Bug 12285: Use
accountlines date if issue is not found", "129947 - Bug 12285: (follow-up)
Correct extra quote in yml file", "133112 - Bug 12285: Don't print fines with
undef amountoutstanding", "133147 - Bug 12285: Determine patrons preferred
languge", "", "Apply? [(y)es, (n)o, (i)nteractive] "]}

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