summaryrefslogtreecommitdiff
path: root/src/ostree/ot-builtin-static-delta.c
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2015-01-14 16:53:21 +0100
committerColin Walters <walters@verbum.org>2015-01-15 22:54:56 -0500
commitf2ae405f9f9658cb2252b4cbcc12f222530bcc92 (patch)
treef5fe9310bf1b89fedc2915822ffa6bcc35a6757e /src/ostree/ot-builtin-static-delta.c
parent4841d9a935d0e0cdd904c60d9fd6b59ab034e251 (diff)
downloadostree-f2ae405f9f9658cb2252b4cbcc12f222530bcc92.tar.gz
static-delta: do not accept both --from=REV and --empty for generate
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'src/ostree/ot-builtin-static-delta.c')
-rw-r--r--src/ostree/ot-builtin-static-delta.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ostree/ot-builtin-static-delta.c b/src/ostree/ot-builtin-static-delta.c
index 45ba6b67..b49b9182 100644
--- a/src/ostree/ot-builtin-static-delta.c
+++ b/src/ostree/ot-builtin-static-delta.c
@@ -157,6 +157,12 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab
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;
}
else if (opt_from_rev == NULL)