From c09f64e556ae3a6b3b9c5ab172c4e5c54f539512 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 12 Nov 2021 09:27:36 +0100
Subject: /var/run -> /run

---
 core/includes/packagemanager.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/includes')

diff --git a/core/includes/packagemanager.inc b/core/includes/packagemanager.inc
index 864366eb..1a22f474 100644
--- a/core/includes/packagemanager.inc
+++ b/core/includes/packagemanager.inc
@@ -52,13 +52,14 @@ list_content_package() {
 		PACKAGECOMMAND="rpm -ql"
 	fi
 
+	local filter='share/(man|doc)|^(/var)?/run|^/var/log|^/etc/init\.d'
 	if [ -n "$REQUIRED_PACKET_FILES_BLACKLIST" ]; then
 		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | \
 			grep -v "$REQUIRED_PACKET_FILES_BLACKLIST" | \
-			grep -v -E 'share/(man|doc)|/var/run|/var/log|/etc/init\.d'; \
+			grep -v -E "$filter"; \
 			echo ":###:${PIPESTATUS[0]}")"
 	else
-		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log|/etc/init\.d'; echo ":###:${PIPESTATUS[0]}")"
+		FILES="$($PACKAGECOMMAND "$PACKAGE" | grep "^/" | grep -v -E "$filter"; echo ":###:${PIPESTATUS[0]}")"
 	fi
 
 	# ugly hack to get our return value
-- 
cgit v1.2.3-55-g7522