-
-
Notifications
You must be signed in to change notification settings - Fork 552
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix namespace detection from distro IDs #3770
Open
AyanSinhaMahapatra
wants to merge
4
commits into
develop
Choose a base branch
from
fix-rpm-namespace
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e0a985a
Detect distro files in system package scans
AyanSinhaMahapatra c9b9175
Parse and set namespace from distro ID correctly
AyanSinhaMahapatra 8797c9f
Update default package type for alpine apk packages
AyanSinhaMahapatra 4c9e044
Fix namespace assignment from distro ID
AyanSinhaMahapatra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,24 +27,34 @@ class EtcOsReleaseHandler(models.NonAssemblableDatafileHandler): | |
@classmethod | ||
def parse(cls, location, package_only=False): | ||
distro = Distro.from_os_release_file(location) | ||
distro_identifier = distro.identifier | ||
distro_identifier = None | ||
if distro: | ||
distro_identifier = distro.identifier | ||
|
||
if not distro_identifier: | ||
return | ||
|
||
pretty_name = distro.pretty_name and distro.pretty_name.lower() or '' | ||
|
||
# TODO: It is misleading to use package data fields | ||
# name and namespace to store distro/os infomration, | ||
# we should consider using extra_data fields instead. | ||
|
||
if distro_identifier == 'debian': | ||
namespace = 'debian' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are you sure there is no namespace? |
||
name = 'debian' | ||
|
||
if 'distroless' in pretty_name: | ||
name = 'distroless' | ||
elif pretty_name.startswith('debian'): | ||
name = 'distroless' | ||
namespace = 'distroless' | ||
else: | ||
namespace = 'debian' | ||
|
||
elif distro_identifier == 'ubuntu' and distro.id_like == 'debian': | ||
namespace = 'debian' | ||
name = 'ubuntu' | ||
namespace = 'ubuntu' | ||
name = 'debian' | ||
|
||
elif distro_identifier.startswith('fedora') or distro.id_like == 'fedora': | ||
namespace = distro_identifier | ||
name = distro.id_like or distro_identifier | ||
elif distro_identifier.startswith('fedora') or distro.id_like == 'fedora': | ||
name = distro_identifier or distro.id_like | ||
namespace = distro.id_like | ||
|
||
else: | ||
# FIXME: this needs to be seriously updated | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
infomration -> information