Bug 20393 - Remove redundant 'koha.psgi' and 'plackup.sh' files
Summary: Remove redundant 'koha.psgi' and 'plackup.sh' files
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Command-line Utilities (show other bugs)
Version: Main
Hardware: All All
: P5 - low enhancement (vote)
Assignee: Mason James
QA Contact: Testopia
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-03-14 01:11 UTC by Mason James
Modified: 2019-10-14 19:57 UTC (History)
8 users (show)

See Also:
Change sponsored?: ---
Patch complexity: Trivial patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files deleted: misc/plack/koha.psgi deleted: misc/plack/plackup.sh (6.15 KB, patch)
2018-03-14 01:16 UTC, Mason James
Details | Diff | Splinter Review
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files (7.93 KB, patch)
2018-03-14 01:22 UTC, Mason James
Details | Diff | Splinter Review
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files (7.67 KB, patch)
2018-03-28 15:02 UTC, David Bourgault
Details | Diff | Splinter Review
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files (7.75 KB, patch)
2018-06-08 07:01 UTC, Julian Maurice
Details | Diff | Splinter Review
Bug 20393: (QA follow-up) Remove only occurence of misc/plack/koha.psgi (819 bytes, patch)
2018-06-08 07:01 UTC, Julian Maurice
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Mason James 2018-03-14 01:11:58 UTC
It seems both of these files are now superseded by the newer koha-plack and plack.psgi files

they should probably be removed, now that they are not needed
Comment 1 Mason James 2018-03-14 01:16:39 UTC
Created attachment 72823 [details] [review]
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files 	deleted:    misc/plack/koha.psgi 	deleted:    misc/plack/plackup.sh
Comment 2 Mason James 2018-03-14 01:22:26 UTC
Created attachment 72824 [details] [review]
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files
Comment 3 Dilan Johnpullé 2018-03-25 23:22:27 UTC
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
Comment 4 David Bourgault 2018-03-28 15:02:22 UTC
Created attachment 73392 [details] [review]
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files

Corrected modify/delete conflict.

Signed-off-by: David Bourgault <david.bourgault@inlibro.com>
Comment 5 Mason James 2018-05-02 01:47:14 UTC
(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
Comment 6 Mason James 2018-05-02 01:47:57 UTC
(In reply to David Bourgault from comment #4)
> Created attachment 73392 [details] [review] [review]
> Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files
> 
> Corrected modify/delete conflict.
> 
> Signed-off-by: David Bourgault <david.bourgault@inlibro.com>

^...setting to signed-off for David :0)
Comment 7 Marcel de Rooy 2018-05-11 09:03:46 UTC
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.
Comment 8 Julian Maurice 2018-06-08 07:01:23 UTC
Created attachment 75895 [details] [review]
Bug 20393: Remove redundant 'koha.psgi' and 'plackup.sh' files

Signed-off-by: David Bourgault <david.bourgault@inlibro.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Comment 9 Julian Maurice 2018-06-08 07:01:27 UTC
Created attachment 75896 [details] [review]
Bug 20393: (QA follow-up) Remove only occurence of misc/plack/koha.psgi

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Comment 10 Nick Clemens 2018-07-18 19:14:15 UTC
Awesome work all!

Pushed to master for 18.11
Comment 11 Martin Renvoize 2018-08-02 13:27:18 UTC
Enhancement, will not be backported to 18.05.x series.