36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From d79d2432dae005d61797a3715760a7f671d4eba8 Mon Sep 17 00:00:00 2001
|
|
From: Evan Goode <mail@evangoo.de>
|
|
Date: Fri, 6 Jun 2025 21:24:20 +0000
|
|
Subject: [PATCH 6/8] Support globs in usr_drift_protected_paths
|
|
|
|
---
|
|
dnf/cli/cli.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
|
|
index 8816cfc3f..289c88224 100644
|
|
--- a/dnf/cli/cli.py
|
|
+++ b/dnf/cli/cli.py
|
|
@@ -31,6 +31,7 @@ except ImportError:
|
|
from collections import Sequence
|
|
from collections import defaultdict
|
|
import datetime
|
|
+from fnmatch import fnmatch
|
|
import logging
|
|
import operator
|
|
import os
|
|
@@ -251,8 +252,8 @@ class BaseCli(dnf.Base):
|
|
transaction_protected_paths = defaultdict(list)
|
|
for pkg in trans:
|
|
for pkg_file_path in sorted(pkg.files):
|
|
- for protected_path in self.conf.usr_drift_protected_paths:
|
|
- if pkg_file_path.startswith("%s/" % protected_path) or pkg_file_path == protected_path:
|
|
+ for protected_pattern in self.conf.usr_drift_protected_paths:
|
|
+ if fnmatch(pkg_file_path, protected_pattern):
|
|
transaction_protected_paths[pkg.nevra].append(pkg_file_path)
|
|
if transaction_protected_paths:
|
|
logger.info(_('This operation would modify the following paths, possibly introducing '
|
|
--
|
|
2.49.0
|
|
|