virt-v2v/0001-output-o-json-Allow-oo-output-options-to-work.patch
Richard W.M. Jones 7c71720a7f Rebase to upstream 1.45.97.
resolves: rhbz#2011713
Fix -o rhv mode
resolves: rhbz#2027598
input: xen: Fix assertion error when importing from remote block device
resolves: rhbz#2041852
output: -o json: Allow -oo (output options) to work
resolves: rhbz#2041850
2022-01-18 21:35:54 +00:00

32 lines
1.0 KiB
Diff

From cdde7864f65c7c3cf3400b978a52ade727402e17 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 18 Jan 2022 12:21:05 +0000
Subject: [PATCH] output: -o json: Allow -oo (output options) to work
Because of an incorrect error message added during modularisation it
was not possible to use the -o json -oo output options. Remove the
bogus error message.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2041850
Reported-by: Xiaodai Wang
---
output/output_json.ml | 2 --
1 file changed, 2 deletions(-)
diff --git a/output/output_json.ml b/output/output_json.ml
index 770eb8ca..bb0cdfeb 100644
--- a/output/output_json.ml
+++ b/output/output_json.ml
@@ -135,8 +135,6 @@ module Json = struct
type t = unit
let setup dir options source =
- if options.output_options <> [] then
- error (f_"no -oo (output options) are allowed here");
let data = json_parse_options options in
let output_name = get_output_name options source in
let disks = get_disks dir in
--
2.31.1