Skip to content

fix: allow fedora based packages #3479

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 12, 2023
Merged

fix: allow fedora based packages #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab3c011
fix: allow fedora distrobutions to work
philcali Aug 3, 2023
1d5e441
fix: help test
philcali Aug 3, 2023
2f05136
fix: make rpmdb.sqlite much smaller
philcali Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,7 @@ geckodriver.log
var
.metaflow
selenium
/dist/
/dist/

# Ignore extra rpmdb sqlite stuff
rpmdb.sqlite-*
5 changes: 2 additions & 3 deletions src/packagedcode/rpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,9 @@ class RpmInstalledNdbDatabaseHandler(BaseRpmInstalledDatabaseHandler):

# TODO: add dependencies!!!
class RpmInstalledSqliteDatabaseHandler(BaseRpmInstalledDatabaseHandler):
# used by newer RHEL/CentOS/Fedora
# used by newer RHEL/CentOS/Fedora/CoreOS
datasource_id = 'rpm_installed_database_sqlite'
path_patterns = ('*var/lib/rpm/rpmdb.sqlite',)
filetypes = ('berkeley',)
path_patterns = ('*rpm/rpmdb.sqlite',)
default_package_type = 'rpm'
default_package_namespace = 'TBD'
description = 'RPM installed package SQLite database'
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/plugin/help.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ Package type: rpm
documentation URL: https://fedoraproject.org/wiki/Changes/Sqlite_Rpmdb
primary language: None
description: RPM installed package SQLite database
path_patterns: '*var/lib/rpm/rpmdb.sqlite'
path_patterns: '*rpm/rpmdb.sqlite'
--------------------------------------------
Package type: rpm
datasource_id: rpm_spefile
Expand Down
Binary file added tests/packagedcode/data/rpm/rpmdb.sqlite
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions tests/packagedcode/test_recognize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,9 @@ def test_recognize_go_sum(self):
packages = recognize_package_data(test_file)
assert packages
assert isinstance(packages[0], models.PackageData)

def test_recognize_rpmdb_sqlite(self):
test_file = self.get_test_loc('rpm/rpmdb.sqlite')
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we could get a much smaller test file for this? we only need a few packages not everything.

packages = recognize_package_data(test_file, system=True)
assert packages
assert isinstance(packages[0], models.PackageData)