Skip to content

Conversation

404-geek
Copy link
Contributor

No description provided.

@404-geek 404-geek changed the title 404 geek develop alpine url bug fix and AGPL License version issue Apr 20, 2024
@pombredanne
Copy link
Member

@404-geek Thanks... can you check the test failures? Also in the future it is usually best to avoid mixing two unrelated changes in the same PR... here the license detection issue is not related to anything about alpine VCS URL handling, AFAIK ;)

@404-geek
Copy link
Contributor Author

@404-geek Thanks... can you check the test failures? Also in the future it is usually best to avoid mixing two unrelated changes in the same PR... here the license detection issue is not related to anything about alpine VCS URL handling, AFAIK ;)

Sure @pombredanne will take care of not keeping 2 issues in same PR in the future

I have resolved all the test issues. Can you please check once

Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks++ @404-geek , we are mostly there.

@@ -1,5 +1,5 @@
---
license_expression: agpl-3.0-plus OR commercial-license
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While the change is correct note that the rule filenames reflect the license-expression of the rule and a change in the license-expression needs to happen like this:

  1. Deprecate the current rule using the is_deprecated attribute
  2. Reindex the licenses with scancode-reindex-licenses (This will remove the deprecated rule from the index so you can add a new one, otherwise two rules with the same text cannot exist in the index)
  3. Add a new rule for just agpl-3.0-plus and add notes about the origin, that this was previously the src/agpl-3.0-plus_or_commercial-license_4.RULE rule. Add the issue reference in the commit. (You can paste the rule content at etc/scripts/licenses/buildrules-template.txt and then run python etc/scripts/licenses/buildrules.py etc/scripts/licenses/buildrules-template.txt in an activated virtualenv, and this will create the rule automatically, with the appropriate filename)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @AyanSinhaMahapatra I need some help on the buildrules-template.txt for generation.

@AyanSinhaMahapatra
Copy link
Member

@404-geek gentle ping, we need a small update here.

@pombredanne
Copy link
Member

@404-geek ping :) I would like to merge this soon enough!

@AyanSinhaMahapatra
Copy link
Member

See #3740 (comment), will merge the commits thorugh #4093, closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants