From 7a9a12ae3d719fb9a33ad54cdd6046c9737208a5 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 6 Jul 2023 10:03:12 -0400 Subject: [PATCH] fix cp for x509_v2.py --- setup/files/patch/{state => states}/x509_v2.py | 0 setup/so-functions | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename setup/files/patch/{state => states}/x509_v2.py (100%) diff --git a/setup/files/patch/state/x509_v2.py b/setup/files/patch/states/x509_v2.py similarity index 100% rename from setup/files/patch/state/x509_v2.py rename to setup/files/patch/states/x509_v2.py diff --git a/setup/so-functions b/setup/so-functions index b2b5f167f..79c051e23 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2048,7 +2048,7 @@ saltify() { # this can be removed when https://github.com/saltstack/salt/issues/64195 is resolved if [ $SALTVERSION == "3006.1" ]; then - logCmd "\cp -f ./files/patch/states/x509_v2.py /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py" + logCmd "echo y | cp -v ./files/patch/states/x509_v2.py /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py" fi }