diff options
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rwxr-xr-x | ci/build-check.sh | 2 | ||||
| -rwxr-xr-x | ci/build.sh | 2 | ||||
| -rw-r--r-- | ci/libbuild.sh | 5 | ||||
| -rw-r--r-- | src/libostree/ostree-fetcher-soup.c | 10 |
5 files changed, 13 insertions, 8 deletions
@@ -8,7 +8,7 @@ license = "MIT" name = "ostree" readme = "rust-bindings/README.md" repository = "https://github.com/ostreedev/ostree" -rust-version = "1.63.0" +rust-version = "1.64.0" version = "0.18.0" exclude = [ diff --git a/ci/build-check.sh b/ci/build-check.sh index aed8ba7e..716052c1 100755 --- a/ci/build-check.sh +++ b/ci/build-check.sh @@ -25,7 +25,7 @@ if test -x /usr/bin/clang; then if grep -q -e 'static inline.*_GLIB_AUTOPTR_LIST_FUNC_NAME' /usr/include/glib-2.0/glib/gmacros.h; then echo 'Skipping clang check, see https://bugzilla.gnome.org/show_bug.cgi?id=796346' else - export CFLAGS="-Wall -Werror ${CFLAGS:-}" + export CFLAGS="-Wall -Werror -Wno-error=deprecated-declarations ${CFLAGS:-}" git clean -dfx && git submodule foreach git clean -dfx export CC=clang build diff --git a/ci/build.sh b/ci/build.sh index 2afcd018..48605658 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -30,6 +30,6 @@ esac # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # NB: this disables the default set of flags from configure.ac -export CFLAGS="-Wall -Werror ${CFLAGS:-}" +export CFLAGS="-Wall -Werror -Wno-error=deprecated-declarations ${CFLAGS:-}" build --enable-gtk-doc ${CONFIGOPTS:-} diff --git a/ci/libbuild.sh b/ci/libbuild.sh index ffc65585..9938e282 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -36,11 +36,6 @@ pkg_install_if_os() { pkg_install_buildroot() { case "${OS_ID}" in fedora) - # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89 - # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups - if rpm -q fedora-release-container; then - dnf -y swap fedora-release{-container,} - fi pkg_install dnf-plugins-core @buildsys-build;; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; esac diff --git a/src/libostree/ostree-fetcher-soup.c b/src/libostree/ostree-fetcher-soup.c index 53a63f14..638a950b 100644 --- a/src/libostree/ostree-fetcher-soup.c +++ b/src/libostree/ostree-fetcher-soup.c @@ -485,6 +485,12 @@ session_thread_request_uri (ThreadClosure *thread_closure, return; } + { + g_autofree gchar *uri_str = soup_uri_to_string (soup_request_get_uri (pending->request), FALSE); + g_debug ("%s: starting request %p for URI %s, using GTask %p", + G_STRFUNC, pending->request, uri_str, task); + } + if (SOUP_IS_REQUEST_HTTP (pending->request) && thread_closure->extra_headers) { glnx_unref_object SoupMessage *msg = soup_request_http_get_message ((SoupRequestHTTP*) pending->request); @@ -1069,6 +1075,10 @@ on_request_sent (GObject *object, pending->request_body = soup_request_send_finish ((SoupRequest*) object, result, &local_error); + g_debug ("%s: request %p (GTask %p) finished with request_body %p and error %s", + G_STRFUNC, object, task, pending->request_body, + (local_error != NULL) ? local_error->message : "none"); + if (!pending->request_body) goto out; g_assert_no_error (local_error); |