Skip to content

Commit bf518a9

Browse files
Add WHITE_OUT flag for whiteout files instead of IGNORED_WHITEOUT
1 parent cb2d65e commit bf518a9

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

scanpipe/pipes/docker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,13 @@ def scan_image_for_system_packages(project, image):
268268

269269
def flag_whiteout_codebase_resources(project):
270270
"""
271-
Tag overlayfs/AUFS whiteout special files CodebaseResource as "ignored-whiteout".
271+
Tag overlayfs/AUFS whiteout special files CodebaseResource as "white-out".
272272
See https://github.com/opencontainers/image-spec/blob/master/layer.md#whiteouts
273273
for details.
274274
"""
275275
whiteout_prefix = ".wh."
276276
qs = project.codebaseresources.no_status()
277-
qs.filter(name__startswith=whiteout_prefix).update(status=flag.IGNORED_WHITEOUT)
277+
qs.filter(name__startswith=whiteout_prefix).update(status=flag.WHITE_OUT)
278278

279279

280280
layer_fields = [

scanpipe/pipes/flag.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636

3737
RESOURCE_READ_ERROR = "resource-read-error"
3838

39+
WHITE_OUT = "white-out"
40+
3941
IGNORED_WHITEOUT = "ignored-whiteout"
4042
IGNORED_EMPTY_FILE = "ignored-empty-file"
4143
IGNORED_WHITESPACE_FILE = "ignored-whitespace-file"

scanpipe/tests/pipes/test_docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_pipes_docker_flag_whiteout_codebase_resources(self):
9090
resource1.refresh_from_db()
9191
resource2.refresh_from_db()
9292
self.assertEqual("", resource1.status)
93-
self.assertEqual("ignored-whiteout", resource2.status)
93+
self.assertEqual("white-out", resource2.status)
9494

9595
def test_pipes_docker_extract_image_from_tarball_with_broken_symlinks(
9696
self,

0 commit comments

Comments
 (0)