Skip to content

Commit 1088337

Browse files
authored
fix: allow fedora based packages (#3479)
fix: allow fedora distrobutions to work and add tests Signed-off-by: Philip Cali <[email protected]>
1 parent 26ace52 commit 1088337

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,7 @@ geckodriver.log
111111
var
112112
.metaflow
113113
selenium
114-
/dist/
114+
/dist/
115+
116+
# Ignore extra rpmdb sqlite stuff
117+
rpmdb.sqlite-*

src/packagedcode/rpm.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,9 @@ class RpmInstalledNdbDatabaseHandler(BaseRpmInstalledDatabaseHandler):
232232

233233
# TODO: add dependencies!!!
234234
class RpmInstalledSqliteDatabaseHandler(BaseRpmInstalledDatabaseHandler):
235-
# used by newer RHEL/CentOS/Fedora
235+
# used by newer RHEL/CentOS/Fedora/CoreOS
236236
datasource_id = 'rpm_installed_database_sqlite'
237-
path_patterns = ('*var/lib/rpm/rpmdb.sqlite',)
238-
filetypes = ('berkeley',)
237+
path_patterns = ('*rpm/rpmdb.sqlite',)
239238
default_package_type = 'rpm'
240239
default_package_namespace = 'TBD'
241240
description = 'RPM installed package SQLite database'

tests/packagedcode/data/plugin/help.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ Package type: rpm
746746
documentation URL: https://fedoraproject.org/wiki/Changes/Sqlite_Rpmdb
747747
primary language: None
748748
description: RPM installed package SQLite database
749-
path_patterns: '*var/lib/rpm/rpmdb.sqlite'
749+
path_patterns: '*rpm/rpmdb.sqlite'
750750
--------------------------------------------
751751
Package type: rpm
752752
datasource_id: rpm_spefile
336 KB
Binary file not shown.

tests/packagedcode/test_recognize.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,9 @@ def test_recognize_go_sum(self):
196196
packages = recognize_package_data(test_file)
197197
assert packages
198198
assert isinstance(packages[0], models.PackageData)
199+
200+
def test_recognize_rpmdb_sqlite(self):
201+
test_file = self.get_test_loc('rpm/rpmdb.sqlite')
202+
packages = recognize_package_data(test_file, system=True)
203+
assert packages
204+
assert isinstance(packages[0], models.PackageData)

0 commit comments

Comments
 (0)