Skip to content

Commit

Permalink
fixup! compose: Add ostree-layers and ostree-override-layers
Browse files Browse the repository at this point in the history
  • Loading branch information
cgwalters committed Jun 7, 2019
1 parent da3d247 commit b57163c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion src/app/rpmostree-compose-builtin-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -714,9 +714,12 @@ rpm_ostree_compose_context_new (const char *treefile_pathstr,
error))
return FALSE;

g_auto(GStrv) layers = ror_treefile_get_all_ostree_layers (self->treefile_rs);
if (layers && *layers && !opt_unified_core)
return glnx_throw (error, "ostree-layers requires unified-core mode");

if (self->build_repo != self->repo)
{
g_auto(GStrv) layers = ror_treefile_get_all_ostree_layers (self->treefile_rs);
for (char **iter = layers; iter && *iter; iter++)
{
const char *layer = *iter;
Expand Down
6 changes: 3 additions & 3 deletions tests/compose-tests/test-misc-tweaks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ for x in $(seq 3); do
done
rm tmp/usr -rf
mkdir -p tmp/usr/share/info
echo some info | gzip > tmp/usr/share/info/bash.info.gz
echo sweet new ls binary > tmp/usr/bin/ls
ostree --repo="${repobuild}" commit --consume --no-xattrs --owner-uid=0 --owner-gid=0 -b testoverride-1 --tree=dir=tmp
cat >> ${new_treefile} <<EOF
ostree-layers:
Expand Down Expand Up @@ -145,8 +145,8 @@ for x in $(seq 3); do
ostree --repo=${repobuild} cat ${treeref} /usr/share/testsubdir-${x}/test > t
assert_file_has_content t sometestdata-subdir-${x}
done
ostree --repo=${repobuild} cat ${treeref} /usr/share/info/bash.info.gz | gunzip > bash.info
assert_file_has_content bash.info 'some info'
ostree --repo=${repobuild} cat ${treeref} /usr/bin/ls > ls.txt
assert_file_has_content ls.txt '^sweet new ls binary$'
echo "ok layers"

# Check that add-files with bad paths are rejected
Expand Down

0 comments on commit b57163c

Please sign in to comment.