https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Mason James <mtj@kohaaloha.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72823|0 |1 is obsolete| | --- Comment #2 from Mason James <mtj@kohaaloha.com> --- Created attachment 72824 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72824&action=edit Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Dilan Johnpullé <dilan@calyx.net.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dilan@calyx.net.au Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Dilan Johnpullé <dilan@calyx.net.au> --- Attempted to sign off but patch fails to apply. The following is my devbox terminal output: vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files 72824 - Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files fatal: sha1 information is lacking or useless (misc/plack/koha.psgi). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files 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-20393-Remove-redundant-kohapsgi-and-plackupsh--Te2c8M.patch -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 --- Comment #5 from Mason James <mtj@kohaaloha.com> --- (In reply to Dilan Johnpullé from comment #3)

Attempted to sign off but patch fails to apply. The following is my devbox terminal output:

vagrant@kohadevbox:kohaclone(master)$ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files

hi Dilan the patch applies ok for me, against commit e5d5038 (bz-20531) i'm guessing your repo wasn't set to the HEAD of the 'master' branch, before applying try the following... $ git fetch origin master $ git reset --hard origin/master then... $ git bz apply -s 20393 Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files 73392 - Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files ..success :0) $ git log --oneline | head -n 1 bb7e1b7 Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Trivial patch Severity|trivial |enhancement CC| |m.de.rooy@rijksmuseum.nl --- Comment #7 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Wasn't this meant as a dev script only? Not sure if anyone still uses it. (I would prefer to get rid of them too.) No bugfix btw, trivial enh. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=18377 CC| |julian.maurice@biblibre.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 --- Comment #9 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 75896 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=75896&action=edit Bug 20393: (QA follow-up) Remove only occurence of misc/plack/koha.psgi Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20393 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nick@bywatersolutions.com Status|Passed QA |Pushed to Master --- Comment #10 from Nick Clemens <nick@bywatersolutions.com> --- Awesome work all! Pushed to master for 18.11 -- You are receiving this mail because: You are watching all bug changes.