From a4e78a45b22531c1979f2de28fb13bac65cef1ab Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 3 Feb 2025 17:13:51 -0500 Subject: [PATCH] store: Fix semantic merge conflict Not totally sure how this got through CI, but the most recent two PRs semantically conflicted. Update the new code to use the new glib prelude import. Signed-off-by: Colin Walters --- ostree-ext/src/container/store.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs index ee835111..25360ad4 100644 --- a/ostree-ext/src/container/store.rs +++ b/ostree-ext/src/container/store.rs @@ -20,10 +20,10 @@ use containers_image_proxy::{ImageProxy, OpenedImage}; use flate2::Compression; use fn_error_context::context; use futures_util::TryFutureExt; +use glib::prelude::*; use oci_spec::image::{ self as oci_image, Arch, Descriptor, Digest, History, ImageConfiguration, ImageManifest, }; -use ostree::glib::FromVariant; use ostree::prelude::{Cast, FileEnumeratorExt, FileExt, ToVariant}; use ostree::{gio, glib}; use std::collections::{BTreeMap, BTreeSet, HashMap};