lib/checkout: fallback to checksum for UNION_IDENTICAL
There's a subtle issue going on with the way we use `UNION_IDENTICAL` now in rpm-ostree. Basically, the crux of the issue is that we checkout the whole tree from the system repo, but then overlay packages by checking out from the pkgcache repo. This is an easy way to break the assumption that we will be merging hardlinks from the same repo. This ends up causing issues like: https://github.com/projectatomic/rpm-ostree/issues/1047 There, `vim-minimal` is already part of the host and has an object for `/usr/share/man/man1/ex.1.gz`. `vim-common` has that same file, but because it's unpacked in the pkgcache repo first, the hardlinks are not the same. There are a few ways we *could* work around this in rpm-ostree itself, e.g. by re-establishing hardlinks when we do the content pull into the system repo, but it still felt somewhat hacky. Let's just do this the proper way and fall back to checksumming the target file if needed, which is what librpm does as well in this case. Note that we only checksum if they're not hard links, but they're the same size. Closes: #1258 Approved by: cgwalters
This commit is contained in:
1 parent
2a9c5efe1d
commit
9503189362
4 files changed
+48
-3
No files matched your search
@@ -546,6 +546,12 @@ for x in $(seq 3); do
|
||||
assert_file_has_content union-identical-test/usr/share/licenses/${v} GPL
|
||||
done
|
||||
done
|
||||
# now checkout the first pkg in force copy mode to make sure we can checksum
|
||||
rm union-identical-test -rf
|
||||
$OSTREE checkout --force-copy union-identical-pkg1 union-identical-test
|
||||
for x in 2 3; do
|
||||
$OSTREE checkout ${CHECKOUT_H_ARGS} --union-identical union-identical-pkg${x} union-identical-test
|
||||
done
|
||||
echo "ok checkout union identical merges"
|
||||
|
||||
# Make conflicting packages, one with regfile, one with symlink
|
||||
|
||||
Reference in new issue
Block a user