Summary: | Makefile sets koha-httpd api path incorrectly for standard installs | ||
---|---|---|---|
Product: | Koha | Reporter: | Alex Sassmannshausen <alex> |
Component: | REST API | Assignee: | Martin Renvoize <martin.renvoize> |
Status: | CLOSED FIXED | QA Contact: | |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | alexbuckley, dcook, jonathan.druart, mirko, tomascohen |
Version: | unspecified | ||
Hardware: | All | ||
OS: | All | ||
See Also: | https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21031 | ||
Change sponsored?: | --- | Patch complexity: | Trivial patch |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Attachments: | Bug 18175: Use Makefile variable for api path. |
Description
Alex Sassmannshausen
2017-02-27 11:39:50 UTC
Created attachment 60700 [details] [review] Bug 18175: Use Makefile variable for api path. * etc/koha-httpd.conf: Use __API_CGI_DIR__ instead of %{DOCUMENT_ROOT}/../api. Test plan: Confirming the problem: - Do a standard install of Koha - Test any REST API route. - The route will error out. Confirming the resolution: - Apply this patch. - Do a standard install of Koha - Test any REST API route. - The route will work. Confirming no regression: - Apply this patch. - Do a dev install of Koha - Test any REST API route. - The route will work. Hi there Sorry this patch is not applying cleanly on master (as the below output shows), can you please either rebase the patch or define the Koha version this patch should be used on? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 18175: Use Makefile variable for api path. Using index info to reconstruct a base tree... M etc/koha-httpd.conf Falling back to patching base and 3-way merge... Auto-merging etc/koha-httpd.conf CONFLICT (content): Merge conflict in etc/koha-httpd.conf Failed to merge in the changes. Patch failed at 0001 Bug 18175: Use Makefile variable for api path. 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-18175-Use-Makefile-variable-for-api-path-cy4MsZ.patch Cheers, Alex I 'think' this problem has gone away now.. going to mark as resolved. (In reply to Martin Renvoize from comment #3) > I 'think' this problem has gone away now.. going to mark as resolved. I think we fixed it with https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21031. |