Drop support for related objects and metadata in commit objects
While the actual commit object format is presently the same, for a
number of reasons we'd like to change it fairly radically. Among
other things, we need to drop our a{sv} types in objects, to protect
against GVariant changing format.
Since now gnome-ostree now longer uses related objects, and nothing
ever used metadata, just drop them both.
This commit is contained in:
1 parent
1e7c0bb70b
commit
c9b61cbfee
4 files changed
+5
-178
No files matched your search
+1
-22
@@ -19,7 +19,7 @@
|
||||
|
||||
set -e
|
||||
|
||||
echo "1..35"
|
||||
echo "1..33"
|
||||
|
||||
. $(dirname $0)/libtest.sh
|
||||
|
||||
@@ -120,21 +120,6 @@ cd ${test_tmpdir}
|
||||
assert_file_has_content diff-test2-2 'M */four$'
|
||||
echo "ok diff file changing type"
|
||||
|
||||
cd ${test_tmpdir}/checkout-test2-4
|
||||
echo afile > oh-look-a-file
|
||||
cat > ${test_tmpdir}/ostree-commit-metadata <<EOF
|
||||
{'origin': <'http://example.com'>, 'buildid': <@u 42>}
|
||||
EOF
|
||||
$OSTREE commit -b test2 -s "Metadata test" --metadata-variant-text=${test_tmpdir}/ostree-commit-metadata
|
||||
echo "ok metadata commit"
|
||||
|
||||
cd ${test_tmpdir}
|
||||
rm ostree-commit-metadata
|
||||
$OSTREE show test2 > ${test_tmpdir}/show
|
||||
assert_file_has_content ${test_tmpdir}/show 'example.com'
|
||||
assert_file_has_content ${test_tmpdir}/show 'buildid'
|
||||
echo "ok metadata content"
|
||||
|
||||
cd ${test_tmpdir}
|
||||
mkdir repo2
|
||||
${CMD_PREFIX} ostree --repo=repo2 init
|
||||
@@ -162,12 +147,6 @@ new_rev=$($OSTREE rev-parse test2)
|
||||
assert_streq "${old_rev}" "${new_rev}"
|
||||
echo "ok commit --skip-if-unchanged"
|
||||
|
||||
$OSTREE commit -b test2 -s "Metadata string" --add-metadata-string=FOO=BAR --add-metadata-string=KITTENS=CUTE --tree=ref=test2
|
||||
$OSTREE show test2 > test2-commit-text
|
||||
assert_file_has_content test2-commit-text "'FOO'.*'BAR'"
|
||||
assert_file_has_content test2-commit-text "'KITTENS'.*'CUTE'"
|
||||
echo "ok metadata commit with strings"
|
||||
|
||||
cd ${test_tmpdir}/checkout-test2-4
|
||||
$OSTREE commit -b test2 -s "no xattrs" --no-xattrs
|
||||
echo "ok commit with no xattrs"
|
||||
|
||||
Reference in new issue
Block a user