Bug 7934 breaks the -f option introduced by bug 9161.
Created attachment 24459 [details] [review] Bug 11571: FIX regression introduced by bug 7934 Bug 7934 breaks the -f option introduced by bug 9161. While the generation of the command tmpl_process3.pl, a space is missing if the -x option is given. The tmpl_process3.pl is called like: /home/koha/src/misc/translator/tmpl_process3.pl -q update -i /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ -s /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po -r -x 'help'-f pay.tt Test plan: - ./translate update fr-FR -f pay.tt - put a warn at LangInstaller.pm line 375. - note the execution time and the output. The options in the command contain "-x 'help'-f pay.tt" The -f param is not passed to the script. - apply this patch and verify the output and the execution time is not correct.
Created attachment 24484 [details] [review] Bug 11571: FIX regression introduced by bug 7934 Bug 7934 breaks the -f option introduced by bug 9161. While the generation of the command tmpl_process3.pl, a space is missing if the -x option is given. The tmpl_process3.pl is called like: /home/koha/src/misc/translator/tmpl_process3.pl -q update -i /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ -s /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po -r -x 'help'-f pay.tt Test plan: - ./translate update fr-FR -f pay.tt - put a warn at LangInstaller.pm line 375. - note the execution time and the output. The options in the command contain "-x 'help'-f pay.tt" The -f param is not passed to the script. - apply this patch and verify the output and the execution time is now correct.
Second patch replaces 'not' with 'now' in the commit message...
Since it is a regression, easier to test and makes me waste a lot of time (on testing translation), I consider this bug as major.
s/easier/easy
Created attachment 24706 [details] [review] [SIGNED OFF] Bug 11571 - FIX regression introduced by bug 7934 Bug 7934 breaks the -f option introduced in bug 9161. While the generation of the command tmpl_process3.pl, a space is missing if the -x option is given. The tmpl_process3.pl is called like: /home/koha/src/misc/translator/tmpl_process3.pl -q update -i /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ -s /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po -r -x 'help'-f pay.tt Revised test plan: 1) cd ./misc/translator 2) put a warn at LangInstaller.pm line 375. 3) time ./translate update fr-FR -f pay.tt -- note the execution time and the output. The options in the command contain "-x 'help'-f pay.tt" The -f param is not passed to the script. The execution time is strangely long. 5) git reset --hard origin/master 6) apply this patch 7) put a warn at LangInstaller.pm line 375. 8) time ./translate update fr-FR -f pay.tt -- verify the output and the execution time is now corrected. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
> -- verify the output and the execution time is now corrected. s/is/are ...
Created attachment 24729 [details] [review] [PASSED QA] Bug 11571 - FIX regression introduced by bug 7934 Bug 7934 breaks the -f option introduced in bug 9161. While the generation of the command tmpl_process3.pl, a space is missing if the -x option is given. The tmpl_process3.pl is called like: /home/koha/src/misc/translator/tmpl_process3.pl -q update -i /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/ -s /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po -r -x 'help'-f pay.tt Revised test plan: 1) cd ./misc/translator 2) put a warn at LangInstaller.pm line 375. 3) time ./translate update fr-FR -f pay.tt -- note the execution time and the output. The options in the command contain "-x 'help'-f pay.tt" The -f param is not passed to the script. The execution time is strangely long. 5) git reset --hard origin/master 6) apply this patch 7) put a warn at LangInstaller.pm line 375. 8) time ./translate update fr-FR -f pay.tt -- verify the output and the execution time is now corrected. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script.
Pushed to master. Thanks, Jonathan!
I've choosen to not backport Bug 7934 to 3.14.x so this this resolved. This is now in 3.16.x