[Bug 29324] New: Some files still don't have the correct license statement
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Bug ID: 29324 Summary: Some files still don't have the correct license statement Change sponsored?: --- Product: Koha Version: unspecified Hardware: All OS: All Status: NEW Severity: minor Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: koha-bugs@lists.koha-community.org Reporter: jonathan.druart+koha@gmail.com QA Contact: testopia@bugs.koha-community.org Depends on: 24545 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24545 [Bug 24545] Replace Franklin Street by gnu.org/licenses in copyright -- 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=29324 --- Comment #1 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 126916 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=126916&action=edit Bug 29324: Adjust tests -- 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=29324 --- Comment #2 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Anybody willing to make those tests pass? The copyright/license statement from Koha/Biblio.pm needs to be copied to the different files that make this test fails. -- 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=29324 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |Academy -- 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=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |philip.orr@lmscloud.de --- Comment #3 from Philip Orr <philip.orr@lmscloud.de> --- Hmm, I didn't do anything but apply the patch and run the test and the tests already aren't failing for me. kohadev-koha@kohadevbox:xt(bug29324)$ perl find-license-problems.t ok 1 ok 2 ok 3 ok 4 ok 5 ok 6 ok 7 ok 8 ok 9 ok 10 ok 11 ok 12 ok 13 ok 14 ok 15 1..15 -- 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=29324 --- Comment #4 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Philip Orr from comment #3)
Hmm, I didn't do anything but apply the patch and run the test and the tests already aren't failing for me.
kohadev-koha@kohadevbox:xt(bug29324)$ perl find-license-problems.t ok 1 ok 2 ok 3 ok 4 ok 5 ok 6 ok 7 ok 8 ok 9 ok 10 ok 11 ok 12 ok 13 ok 14 ok 15 1..15
Hi Philip, This is still valid, there are more than 15 tests. You need to run the script from the root of the Koha src directory, not from xt. You will get: # Failed test at xt/find-license-problems.t line 63. # got: '0' # expected: '1' # File ./Koha/Course.pm has wrong copyright: hasgpl=1, hasv3=1, hasorlater=1, haslinktolicense=0, hasfranklinst=1 # Failed test at xt/find-license-problems.t line 63. # got: '0' # expected: '1' # File ./Koha/Courses.pm has wrong copyright: hasgpl=1, hasv3=1, hasorlater=1, haslinktolicense=0, hasfranklinst=1 And so on... -- 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=29324 --- Comment #5 from Philip Orr <philip.orr@lmscloud.de> --- Hi Jonathan, ah, makes sense. I get the failing tests now. Thanks! -- 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=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |philip.orr@lmscloud.de |ity.org | Status|NEW |ASSIGNED -- 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=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Trivial patch Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #126916|0 |1 is obsolete| | --- Comment #6 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153309 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153309&action=edit Bug 29324: Adjust tests -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #7 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153310 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153310&action=edit Bug 29324: Change license statements in various files This patch adds the correct license statements to various files that didn't contain them. To test: 1. Before applying the patch, run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 2. Observe that 14 tests fail. 3. Apply the patch. 4. Run the test again 5. Observe that no tests fail. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #8 from Philip Orr <philip.orr@lmscloud.de> --- Just a note on this patch: Two files already contained parts copyright or author statements. misc/translator/tmpl_process3.pl contained the following: # Parts copyright 2003-2004 Paul Poulain # Parts copyright 2003-2004 Jerome Vizcaino # Parts copyright 2004 Ambrose Li reports/orders_by_fund.pl contained: # Author : Frédérick Capovilla, 2011 - SYS-TECH # Modified by : Élyse Morin, 2012 - Libéo I left those statements in the files and only added to them the other missing license or copyright info. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #9 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Philip, happy to see you submitting patches! It looks like all files now have these lines included: +# Copyright 2000-2002 Katipo Communications +# Copyright 2010 BibLibre +# Copyright 2011 Equinox Software, Inc. This doesn't seem right to me. Should we not just update the license statements (This file is part of Koha...) here? https://wiki.koha-community.org/wiki/Coding_Guidelines#Licence -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #10 from Philip Orr <philip.orr@lmscloud.de> --- Hi Katrin, happy to be able to :-) Hmm, I see what you mean. However find-license-problems.t fails if there isn't at least one copyright statement in the file, and some of them didn't have a statement yet. For example see the diff in my patch for Koha/Course.pm. So how do we handle those cases? Jonathan mentioned:
The copyright/license statement from Koha/Biblio.pm needs to be copied to the >>different files that make this test fails.
Is that because Koha/Biblio.pm has the same authors as e.g. Course.pm? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #11 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm, I am not sure how the test works, but giving those 3 copyright to files they might have never touched seems not right :) Maybe Joubu can help at least on how the test is supposed to be read? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #12 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Files are supposed to have a copyright statement. We use to add "# Copyright YEAR Koha Development Team", even if it's not 100% correct (Koha Development TEAM is not a legal entity) at least it seems better than no statement. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #13 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Jonathan Druart from comment #12)
Files are supposed to have a copyright statement. We use to add "# Copyright YEAR Koha Development Team", even if it's not 100% correct (Koha Development TEAM is not a legal entity) at least it seems better than no statement.
Sounds good to me. YEAR being the current year? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #14 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Katrin Fischer from comment #13)
YEAR being the current year?
Yes -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #15 from Philip Orr <philip.orr@lmscloud.de> --- OK, I'll add a new patch! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153309|0 |1 is obsolete| | Attachment #153310|0 |1 is obsolete| | --- Comment #16 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153555 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153555&action=edit Bug 29324: Adjust tests -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #17 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153556 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153556&action=edit Bug 29324: Changed patch to correct copyright This changes the previous patch to add the correct copyright and license statements to various files that didn't contain them. To test: 1. Before applying the patch, run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 2. Observe that 14 tests fail. 3. Apply the patch. 4. Run the test again 5. Observe that no tests fail. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153555|0 |1 is obsolete| | Attachment #153556|0 |1 is obsolete| | --- Comment #18 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 153680 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153680&action=edit Bug 29324: Adjust tests Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #19 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 153681 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153681&action=edit Bug 29324: Changed patch to correct copyright This changes the previous patch to add the correct copyright and license statements to various files that didn't contain them. To test: 1. Before applying the patch, run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 2. Observe that 14 tests fail. 3. Apply the patch. 4. Run the test again 5. Observe that no tests fail. Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl Status|Signed Off |Failed QA --- Comment #20 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Just noting that I tend to write Koha development team. Inline with other not all caps stuff. I opened a few Koha modules and saw a lot of them missing Copyright lines. If we are fixing this script, lets add a test now too for the Copyright line. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |m.de.rooy@rijksmuseum.nl |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #21 from Philip Orr <philip.orr@lmscloud.de> --- Hi Marcel, thanks for QA'ing! The test should already check if a file is missing a Copyright line, something must be going wrong there. I'll take a look at it and see if I can figure it out. Just to be sure - can you give me an example file where Copyright line is missing? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #22 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Philip Orr from comment #21)
Just to be sure - can you give me an example file where Copyright line is missing?
There are lots. Just in Koha folder: grep -L "Copyright" *.pm| wc -l 83 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #23 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153861 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153861&action=edit Bug 29324: change test to look for copyright This patch makes some changes to the test file find-license-problems.t so that it will also check if the file contains a copyright statement and fail if it doesn't. Note that the test file now only checks files that end with .pm, other file types are ignored. To test: 1. Apply the patch 2. run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 3. Note that now many more files are failing the test than before. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |In Discussion --- Comment #24 from Philip Orr <philip.orr@lmscloud.de> --- This might be a stupid question, so sorry for that.. Should we only be checking .pm files for copyright / license problems? Shouldn't we also be checking .pl, .js ... ? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #25 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Philip Orr from comment #24)
This might be a stupid question, so sorry for that.. Should we only be checking .pm files for copyright / license problems? Shouldn't we also be checking .pl, .js ... ?
Sure. I just gave you few examples. In the .pm and .pl we normally add the license and copyright. A lot of js is in the .tt files without license/copyright. There are indeed some separate js files. They normally dont contain that info. And I agree that they probably should. But perhaps move that to another report.. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Failed QA --- Comment #26 from Philip Orr <philip.orr@lmscloud.de> --- OK, got it. Thanks Marcel for the feedback! I'll change the test and then get to work on the files themselves, staying on failed QA until then. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #27 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 153899 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153899&action=edit Bug 29324: Change test to look at all .pm or .pl files This patch changes the test at xt/find-license-problems.t to look at all .pm or .pl files. Other files will only be checked if they contain the message "This file is part of Koha". To test: 1. Apply the patch 2. Run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 3. You should be getting 1476 fails -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #28 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Philip Orr from comment #27)
3. You should be getting 1476 fails Wow
Maybe we should ignore this directory: File ./installer/data/mysql/db_revs/211200038.pl has wrong copyright We wont be adding license and copyright to all those small dbrevs. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #29 from Philip Orr <philip.orr@lmscloud.de> --- Sounds good. Though that's "only" about 270 files. Around half of the files are missing both copyright and license statements (ca. 750). The other half are only missing copyright statements. Different question though. Some files (for instance Koha/AdditionalFields.pm) include the copyright and license statement as part of pod documentation. In that case, should I just leave the file as-is or should I add license/copyright statements commented out at the beginning of the file like in Koha/Biblio.pm? Or something else? :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #30 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 153924 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=153924&action=edit Bug 29324: (QA follow-up) Polishing Making the verbose output a bit more manageable with -v option. If we just run the test, we get the total of files with license problems. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #31 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Philip Orr from comment #29)
Different question though. Some files (for instance Koha/AdditionalFields.pm) include the copyright and license statement as part of pod documentation. In that case, should I just leave the file as-is or should I add license/copyright statements commented out at the beginning of the file like in Koha/Biblio.pm?
If it is in POD, it should be fine too. No need to change then.. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #32 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Please see follow-up too. Run script with -v to get the sprintf output -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #33 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- 1..1 not ok 1 - No files without license problems anymore! # Failed test 'No files without license problems anymore!' # at xt/find-license-problems.t line 68. # got: '1218' # expected: '0' # Looks like you failed 1 test of 1. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|Academy | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #34 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- - next unless $hascopyright || $needs_copyright; + next unless $needs_copyright &&!$hascopyright; This might need attention still. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #35 from Philip Orr <philip.orr@lmscloud.de> --- (In reply to Marcel de Rooy from comment #34)
- next unless $hascopyright || $needs_copyright; + next unless $needs_copyright &&!$hascopyright;
This might need attention still.
Hm, the way I understood the original test was that files that already have copyright statements should still be checked (because we also want to check for license statement problems e.g. Franklin Street or gpl v2... etc., even if there's already a copyright statement in the file). Btw thanks for the verbose flag, that makes it much easier :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153924|0 |1 is obsolete| | --- Comment #36 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 154240 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=154240&action=edit Bug 29324: (QA follow-up) Polishing Making the verbose output a bit more manageable with -v option. If we just run the test, we get the total of files with license problems. Added Koha/Schema/Result as exception. Sorts results on file name. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #37 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Philip Orr from comment #35)
Hm, the way I understood the original test was that files that already have copyright statements should still be checked (because we also want to check for license statement problems e.g. Franklin Street or gpl v2... etc., even if there's already a copyright statement in the file).
I fixed it. Restored the old condition. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|Trivial patch |Small patch Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153680|0 |1 is obsolete| | --- Comment #38 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156256 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156256&action=edit Bug 29324: Adjust tests Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153681|0 |1 is obsolete| | --- Comment #39 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156257 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156257&action=edit Bug 29324: Changed patch to correct copyright This changes the previous patch to add the correct copyright and license statements to various files that didn't contain them. To test: 1. Before applying the patch, run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 2. Observe that 14 tests fail. 3. Apply the patch. 4. Run the test again 5. Observe that no tests fail. Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153861|0 |1 is obsolete| | --- Comment #40 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156258 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156258&action=edit Bug 29324: change test to look for copyright This patch makes some changes to the test file find-license-problems.t so that it will also check if the file contains a copyright statement and fail if it doesn't. Note that the test file now only checks files that end with .pm, other file types are ignored. To test: 1. Apply the patch 2. run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 3. Note that now many more files are failing the test than before. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #153899|0 |1 is obsolete| | --- Comment #41 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156259 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156259&action=edit Bug 29324: Change test to look at all .pm or .pl files This patch changes the test at xt/find-license-problems.t to look at all .pm or .pl files. Other files will only be checked if they contain the message "This file is part of Koha". To test: 1. Apply the patch 2. Run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 3. You should be getting 1476 fails -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #154240|0 |1 is obsolete| | --- Comment #42 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156260 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156260&action=edit Bug 29324: (QA follow-up) Polishing Making the verbose output a bit more manageable with -v option. If we just run the test, we get the total of files with license problems. Added Koha/Schema/Result as exception. Sorts results on file name. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #43 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156261 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156261&action=edit Bug 29324: Prepend copyright or license statement This patch adds a new perl script based on find-license-problems.pl to prepend missing copyright or license statements (or both) to files. To test: 1. Apply the patch 2. Run perl xt/find-license-problems.t 3. You should get some fails 4. Run perl xt/prependcopyrightandlicense.pl 5. Run perl xt/find-license-problems.t again 6. You should now no longer have any fails. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #44 from Philip Orr <philip.orr@lmscloud.de> --- Created attachment 156262 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156262&action=edit Bug 29324: Add missing copyright and license info This patch adds a new perl file to prepend copyright and/or license statements to all files that are missing them in the directory (and subdirectories) in which it is run. To test: 1. Apply the patch 2. Run perl xt/find-license-problems.t 3. Note there are some fails 4. Run perl xt/prependcopyrightandlicense.pl 5. Run perl xt/find-license-problems.t again 6. No more fails :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 Philip Orr <philip.orr@lmscloud.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #45 from Philip Orr <philip.orr@lmscloud.de> --- Oops.. just noticed, with this patch, I would be prepending the copyright/license info before the shebang. Setting back to failed QA. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29324 --- Comment #46 from Philip Orr <philip.orr@lmscloud.de> --- Thought about this one a little more over the weekend. Perl files will need the shebang to be the first line. For other files, (I hope) it doesn't matter if copyright/license statements are the first line. What I'm going to try is something like: - if the first line is a shebang, add copyright/license info starting from the second line - if not, add copyright/license info directly from the first line -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org