Skip to content

Conversation

@pombredanne
Copy link
Member

This PR fixes inconsistencies in Distro.from_rootfs()
It also merges the latest skeleton and applies some minor cosmetic code updates

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
From aboutcode-org/typecode#20

Reported-by: Pierre Tardy <pierre.tardy@renault.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
And remove v prefix from fallback version

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
- Accept empty and non-existing location when creating a Distro; return
  None
- Properly merge base_distro if provided. Accept no base_distro.
  Raise Exception on inconsistent OS
- Do not use "linux" as Distro() default
- Do not return "windows" if no distro is found.

This was found in https://github.com/nexB/scancode.io

Reported-by: tdruez <tdruez@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Copy link
Member Author

@tdruez ping ... for your review
The only thing you may care for is in this commit c401767

@pombredanne pombredanne requested a review from tdruez June 4, 2021 13:23
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Add separate function and tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Copy link
Member Author

All green. Merging!

@pombredanne pombredanne merged commit 5bd7600 into main Jun 5, 2021
@pombredanne pombredanne deleted the make-distro-work branch June 5, 2021 15:15
pombredanne pushed a commit that referenced this pull request Oct 22, 2021
Signed-off-by: Jono Yang <jyang@nexb.com>
pombredanne pushed a commit that referenced this pull request Oct 22, 2021
Check for deps in local thirdparty directory #31
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.

2 participants