From c241a883221f9d04128b813571c6653ddfac4441 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Fri, 15 Sep 2023 13:14:46 +0500 Subject: [PATCH] Fix rpmlint and lintian errors --- build/install/deb/debian/product-proxy.preinst | 1 + build/install/rpm/SPECS/SOURCES/product.rpmlintrc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/build/install/deb/debian/product-proxy.preinst b/build/install/deb/debian/product-proxy.preinst index 8e018fc188..ca58abe35c 100644 --- a/build/install/deb/debian/product-proxy.preinst +++ b/build/install/deb/debian/product-proxy.preinst @@ -1,4 +1,5 @@ #!/bin/bash +set -e # (DS v1.1.3) Removing old nginx configs to prevent conflicts before upgrading on OpenResty. if [ -f /etc/nginx/conf.d/onlyoffice.conf ]; then diff --git a/build/install/rpm/SPECS/SOURCES/product.rpmlintrc b/build/install/rpm/SPECS/SOURCES/product.rpmlintrc index 02960f35a6..7cdb80e2d2 100644 --- a/build/install/rpm/SPECS/SOURCES/product.rpmlintrc +++ b/build/install/rpm/SPECS/SOURCES/product.rpmlintrc @@ -66,3 +66,6 @@ addFilter(r'arch-independent-package-contains-binary-or-object') # /var/www/{{product}}/services/ASC.Web.HealthChecks.UI/runtimes/browser-wasm/nativeassets/net7.0/e_sqlite3.a addFilter(r'spurious-executable-perm') addFilter(r'devel-file-in-non-devel-package') + +# Necessary to resolve a config conflict +addFilter(r'dangerous-command-in-%pre')