import librepo-1.14.2-1.el8

This commit is contained in:
CentOS Sources 2022-03-29 14:49:27 -04:00 committed by Stepan Oksanichenko
parent c154c2901c
commit f0f76702b3
4 changed files with 10 additions and 51 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/librepo-1.14.0.tar.gz SOURCES/librepo-1.14.2.tar.gz

View File

@ -1 +1 @@
b09cf9ac3751e3c513e1c30a527d1a5e460853b7 SOURCES/librepo-1.14.0.tar.gz c9f39d7497d310ae220df2dfbd8e95f347e2bc8c SOURCES/librepo-1.14.2.tar.gz

View File

@ -1,44 +0,0 @@
From 33be80700bc594f34818ce697493c17e70430390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
Date: Mon, 17 May 2021 08:50:25 +0200
Subject: [PATCH] Recover from fsync fail on read-only filesystem
(RhBug:1956361)
When `fsync` fails due to the file not supporting synchronization just log
the problem instead of failing the whole dnf run. This happens for
example with filesystems mounted read-only in which case there is no
point to `fsync` anyway.
Currently we also ignore return values from `FSETXATTR` which also fails
on read-only filesystem (so no checksum cache is set). This is fine however
since the checksum is recomputed when needed, dnf is just a bit slower.
https://bugzilla.redhat.com/show_bug.cgi?id=1956361
---
librepo/checksum.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/librepo/checksum.c b/librepo/checksum.c
index db37040..6bba53c 100644
--- a/librepo/checksum.c
+++ b/librepo/checksum.c
@@ -266,9 +266,13 @@ lr_checksum_fd_compare(LrChecksumType type,
*matches = (strcmp(expected, checksum)) ? FALSE : TRUE;
if (fsync(fd) != 0) {
- g_set_error(err, LR_CHECKSUM_ERROR, LRE_FILE,
- "fsync failed: %s", strerror(errno));
- return FALSE;
+ if (errno == EROFS || errno == EINVAL) {
+ g_debug("fsync failed: %s", strerror(errno));
+ } else {
+ g_set_error(err, LR_CHECKSUM_ERROR, LRE_FILE,
+ "fsync failed: %s", strerror(errno));
+ return FALSE;
+ }
}
if (caching && *matches && timestamp != -1) {
--
2.31.1

View File

@ -11,16 +11,14 @@
%global dnf_conflict 2.8.8 %global dnf_conflict 2.8.8
Name: librepo Name: librepo
Version: 1.14.0 Version: 1.14.2
Release: 2%{?dist} Release: 1%{?dist}
Summary: Repodata downloading library Summary: Repodata downloading library
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/rpm-software-management/librepo URL: https://github.com/rpm-software-management/librepo
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch1: 0001-Recover-from-fsync-fail-on-read-only-filesystem-RhBu.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: check-devel BuildRequires: check-devel
@ -53,7 +51,6 @@ Summary: Python 3 bindings for the librepo library
%{?python_provide:%python_provide python3-%{name}} %{?python_provide:%python_provide python3-%{name}}
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-gpg BuildRequires: python3-gpg
BuildRequires: python3-flask
BuildRequires: python3-pyxattr BuildRequires: python3-pyxattr
BuildRequires: python3-requests BuildRequires: python3-requests
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
@ -99,6 +96,12 @@ Python 3 bindings for the librepo library.
%{python3_sitearch}/%{name}/ %{python3_sitearch}/%{name}/
%changelog %changelog
* Tue Nov 09 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 1.14.2-1
- Update to 1.14.2
- Reduce time to load metadata
- Fix resource leaks and memory leaks
- Remove build dependency on python3-flask
* Fri Jun 25 2021 Marek Blaha <mblaha@redhat.com> - 1.14.0-2 * Fri Jun 25 2021 Marek Blaha <mblaha@redhat.com> - 1.14.0-2
- Recover from fsync fail on read-only filesystem (RhBug:1956361) - Recover from fsync fail on read-only filesystem (RhBug:1956361)