Michael Schröder 2022-07-21 14:20:54 +00:00 committed by Git OBS Bridge
parent c793cb9035
commit c8d6762363
6 changed files with 10 additions and 47 deletions

View File

@ -1,31 +0,0 @@
commit 03f146e955e099c24f7a49eff461645e1c0a0fd7
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Thu Jan 13 11:25:30 2022 +0200
Fix minimize_writes not minimizing writes since 4.15 regression
Commit 13f70e3710b2df49a923cc6450ff4a8f86e65666 caused minimize_writes
to actually not minimize anything since fsmVerify() only "verifies"
the thing does NOT exist anymore when it exist. Sigh.
FA_TOUCH needs different kind of verification, stat the file instead
to see if it needs creating afterall. This is all soooo broken...
Fixes: #1881
--- lib/fsm.c.orig
+++ lib/fsm.c
@@ -945,7 +945,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
}
/* Assume file does't exist when tmp suffix is in use */
if (!fp->suffix) {
- rc = fsmVerify(fp->fpath, fi);
+ if (fp->action == FA_TOUCH) {
+ struct stat sb;
+ rc = fsmStat(fp->fpath, 1, &sb);
+ } else {
+ rc = fsmVerify(fp->fpath, fi);
+ }
} else {
rc = RPMERR_ENOENT;
}

BIN
debugedit-5.0.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,8 @@
------------------------------------------------------------------
Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de
- update to rpm-4.17.1
-------------------------------------------------------------------
Thu Sep 23 20:57:45 CEST 2021 - mls@suse.de

View File

@ -21,7 +21,7 @@
%global with_python 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rpm
Version: 4.17.0
Version: 4.17.1
Release: 0
Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0-or-later

View File

@ -18,9 +18,11 @@ Mon Jun 27 11:01:54 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
- remove obsolete RPM-HOWTO from 1999 (removed RPM-HOWTO.tar.bz2)
- move debugedit to separate package
(Removed debuginfo-mono.patch, debuglink.diff, debugsubpkg.diff,
finddebuginfo-absolute-links.diff, finddebuginfo.diff)
finddebuginfo-absolute-links.diff, finddebuginfo.diff,
singlefilemode.diff)
- move python-rpm-packaging to separate package
(Removed python-rpm-packaging.diff, python-rpm-packaging.tar.bz2
(Removed python-rpm-packaging.diff, python-rpm-packaging.tar.bz2)
-------------------------------------------------------------------
Tue May 31 19:58:07 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -1,10 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000
+++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000
@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do
;;
--dwz-single-file-mode)
dwz_single_file_mode=true
- shift
;;
--build-id-seed)
build_id_seed=$2