Skip to content

Commit 4de3033

Browse files
committed
Fix issues in libocispec
Signed-off-by: Sourav Moitra <sourav.moitr@gmail.com>
1 parent 33ba273 commit 4de3033

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

src/create.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,10 @@ crun_command_create (struct crun_global_arguments *global_args, int argc, char *
157157
ret = init_libcrun_context (&crun_context, argv[first_arg], global_args, err);
158158
if (UNLIKELY (ret < 0))
159159
return ret;
160-
161-
libcrun_error(0, "config path %s\n", config_file);
160+
162161
container = libcrun_container_load_from_file (config_file, err);
163162
if (container == NULL)
164-
libcrun_fail_with_error (0, "error loading config.json XX");
165-
166-
libcrun_debug ("Using bundle: %s", bundle);
163+
libcrun_fail_with_error (0, "error loading config.json");
167164
crun_context.bundle = bundle;
168165
if (getenv ("LISTEN_FDS"))
169166
{

src/crun.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ print_version (FILE *stream, struct argp_state *state arg_unused)
264264

265265
libcrun_handler_manager_print_feature_tags (libcrun_get_handler_manager (), stream);
266266

267-
fprintf (stream, "+ json_t\n");
267+
fprintf (stream, "+JANSSON\n");
268268
}
269269

270270
static error_t

src/libcrun/container.c

-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,6 @@ libcrun_container_load_from_file (const char *path, libcrun_error_t *err)
570570
cleanup_free char *oci_error = NULL;
571571
libcrun_debug ("Loading container from config file: %s", path);
572572
container_def = runtime_spec_schema_config_schema_parse_file (path, NULL, &oci_error);
573-
libcrun_error (0, "Not sure %s - %i - %s\n", path, container_def == NULL, oci_error);
574573
if (container_def == NULL)
575574
{
576575
crun_make_error (err, 0, "load `%s`: %s", path, oci_error);

0 commit comments

Comments
 (0)