Summary: | Remove inconsistency in location of SIPServer.pm | ||
---|---|---|---|
Product: | Koha | Reporter: | Colin Campbell <colin.campbell> |
Component: | SIP2 | Assignee: | Martin Renvoize <martin.renvoize> |
Status: | Patch doesn't apply --- | QA Contact: | Testopia <testopia> |
Severity: | enhancement | ||
Priority: | P5 - low | CC: | chris, colin.campbell, lucas, martin.renvoize |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Attachments: |
Proposed patch
Supplementary patch Bug 15338: Move SIPServer to bin directory Bug 15338: Fix indentation and comments in SIPServer |
Description
Colin Campbell
2015-12-09 11:49:56 UTC
Created attachment 45525 [details] [review] Proposed patch Testing: Using the amended start up and shutdown scripts the server should behave as before this patch was applied Created attachment 45526 [details] [review] Supplementary patch Supplementary patch removes obsolete comments and applies consistent formatting to the code. Adds a comment to indicate Net::Server::Fork is a valid alternative to PreFork Applying: Bug 15338 move SIPServer to bin directory fatal: sha1 information is lacking or useless (C4/SIP/SIPServer.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 15338 move SIPServer to bin directory Created attachment 119002 [details] [review] Bug 15338: Move SIPServer to bin directory SIPServer should reside like other programs in the bin directory rather than lurking in modules removed the pm suffix which confused some users sip_run.sh can now be simplified and not fail because of misuse of path definition as a directory removed the unnecessary sourcing of .bash_profile in shutdown (what if you dont have a bash_profile?) SIP modules are now in standard lib path so Server does not need to set its own lib Created attachment 119003 [details] [review] Bug 15338: Fix indentation and comments in SIPServer Supplemental patch which takes advantage of the relocation of the program to apply a consistent indentation to the code also removes comments arising from the confusion resulting from the program's name and location Add a comment indicating that this code will work under other flavours of Net::Server as well as PreFork No longer applies cleanly to master |