Repository navigation
Commit 4d13d53
authored
mutate: apply opaque-directory whiteouts (.wh..wh..opq) in Extract (#2372)
* mutate: apply opaque-directory whiteouts (.wh..wh..opq) in Extract
Extract did not apply OCI opaque-directory whiteouts (.wh..wh..opq) when
flattening layers, so files a lower layer placed in a directory opaqued by
an upper layer wrongly reappeared in the merged output.
The opaque marker shares the .wh. whiteout prefix, so it matched the generic
per-file whiteout check and was mis-parsed as a whiteout of a phantom file
named ".wh..opq", never marking the directory opaque. Match the marker
exactly and handle it before the generic prefix strip; track opaqued
directories per layer and promote them only after the layer is processed, so
the opaque layer's own entries survive while lower layers are masked. Adds a
regression test.
Signed-off-by: Sadman Fahmid <[email protected]>
Signed-off-by: Sadman Fahmid <[email protected]>1 parent af2603f commit 4d13d53
2 files changed
Lines changed: 103 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
40 | 45 | | |
41 | 46 | | |
42 | 47 | | |
| |||
267 | 272 | | |
268 | 273 | | |
269 | 274 | | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
270 | 278 | | |
271 | 279 | | |
272 | 280 | | |
| |||
277 | 285 | | |
278 | 286 | | |
279 | 287 | | |
280 | | - | |
| 288 | + | |
281 | 289 | | |
282 | 290 | | |
283 | 291 | | |
284 | 292 | | |
285 | 293 | | |
286 | 294 | | |
287 | | - | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
288 | 300 | | |
289 | 301 | | |
290 | 302 | | |
| |||
328 | 340 | | |
329 | 341 | | |
330 | 342 | | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
331 | 351 | | |
332 | 352 | | |
333 | 353 | | |
| |||
351 | 371 | | |
352 | 372 | | |
353 | 373 | | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
354 | 379 | | |
355 | 380 | | |
356 | 381 | | |
| |||
366 | 391 | | |
367 | 392 | | |
368 | 393 | | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
369 | 399 | | |
370 | 400 | | |
371 | 401 | | |
| |||
377 | 407 | | |
378 | 408 | | |
379 | 409 | | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
380 | 424 | | |
381 | 425 | | |
382 | 426 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
108 | 165 | | |
109 | 166 | | |
110 | 167 | | |
| |||
0 commit comments