Fix issues in libocispec

Signed-off-by: Sourav Moitra <[email protected]>
containers · Dec 28, 2024 · 4de3033 · 4de3033
1 parent 33ba273
commit 4de3033
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/libocispec b/libocispec
diff --git a/src/create.c b/src/create.c
@@ -157,13 +157,10 @@ crun_command_create (struct crun_global_arguments *global_args, int argc, char *
   ret = init_libcrun_context (&crun_context, argv[first_arg], global_args, err);
   if (UNLIKELY (ret < 0))
     return ret;
-
-  libcrun_error(0, "config path %s\n", config_file);
+
   container = libcrun_container_load_from_file (config_file, err);
   if (container == NULL)
-    libcrun_fail_with_error (0, "error loading config.json XX");
-
-  libcrun_debug ("Using bundle: %s", bundle);
+    libcrun_fail_with_error (0, "error loading config.json");
   crun_context.bundle = bundle;
   if (getenv ("LISTEN_FDS"))
     {

diff --git a/src/crun.c b/src/crun.c
@@ -264,7 +264,7 @@ print_version (FILE *stream, struct argp_state *state arg_unused)
 
   libcrun_handler_manager_print_feature_tags (libcrun_get_handler_manager (), stream);
 
-  fprintf (stream, "+ json_t\n");
+  fprintf (stream, "+JANSSON\n");
 }
 
 static error_t

diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -570,7 +570,6 @@ libcrun_container_load_from_file (const char *path, libcrun_error_t *err)
   cleanup_free char *oci_error = NULL;
   libcrun_debug ("Loading container from config file: %s", path);
   container_def = runtime_spec_schema_config_schema_parse_file (path, NULL, &oci_error);
-  libcrun_error (0, "Not sure %s - %i - %s\n", path, container_def == NULL, oci_error);
   if (container_def == NULL)
     {
       crun_make_error (err, 0, "load `%s`: %s", path, oci_error);
+1 −1		src/ocispec/sources.py
+7 −2		tests/data/config.json
+4 −0		tests/test-1.c