packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

static-delta: do not accept both --from=REV and --empty for generate 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-01-14 16:53:21 +01:00 committed by Colin Walters
parent 4841d9a935
commit f2ae405f9f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ostree/ot-builtin-static-delta.c
View File

@ -157,6 +157,12 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab
if (opt_empty) if (opt_empty)
{ {
if (opt_from_rev)
{
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Cannot specify both --empty and --from=REV");
goto out;
}
from_source = NULL; from_source = NULL;
} }
else if (opt_from_rev == NULL) else if (opt_from_rev == NULL)

4
tests/test-delta.sh
View File

@ -68,6 +68,10 @@ ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev}
ostree --repo=repo static-delta list | grep ${origrev}-${newrev} || exit 1 ostree --repo=repo static-delta list | grep ${origrev}-${newrev} || exit 1
if ${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --empty 2>>err.txt; then
assert_not_reached "static-delta generate --from=${origrev} --empty unexpectedly succeeded"
fi
origstart=$(echo ${origrev} | dd bs=1 count=2 2>/dev/null) origstart=$(echo ${origrev} | dd bs=1 count=2 2>/dev/null)
origend=$(echo ${origrev} | dd bs=1 skip=2 2>/dev/null) origend=$(echo ${origrev} | dd bs=1 skip=2 2>/dev/null)
assert_has_dir repo/deltas/${origstart}/${origend}-${newrev} assert_has_dir repo/deltas/${origstart}/${origend}-${newrev}