Merge pull request #249 from nexB/enable-rpm-package-getter-for-photon-os

pombredanne · web-flow · commit 736ef5c5b39a · 2021-07-21T08:12:49.000+02:00
Use rpm.package_getter for photon images
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -22,6 +22,9 @@
   calling XlsxWriter and report and error if the truncated can be truncated.
   https://github.com/nexB/scancode.io/issues/206
 
+- Add support for VMWare Photon-based Docker images and rootfs. This is an RPM-based
+  Linux distribution
+
 ### v21.6.10
 
 - Add support for VM image formats extraction such as VMDK, VDI and QCOW.
@@ -298,4 +301,4 @@
 
 ### v1.0.0 (2020-09-09)
 
-- Initial release
+- Initial release
diff --git a/scanpipe/pipes/rootfs.py b/scanpipe/pipes/rootfs.py
@@ -47,6 +47,7 @@
     "sles": rpm.package_getter,
     "opensuse": rpm.package_getter,
     "opensuse-tumbleweed": rpm.package_getter,
+    "photon": rpm.package_getter,
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`"sles": rpm.package_getter,`
`48`	`48`	`"opensuse": rpm.package_getter,`
`49`	`49`	`"opensuse-tumbleweed": rpm.package_getter,`
	`50`	`+ "photon": rpm.package_getter,`
`50`	`51`	`}`
`51`	`52`
`52`	`53`