b17d3e3575
- Fix the usage of custom macros on the spec file. - Fix RES7: different dependency names for python-PyYAML and python-MarkupSafe - Build both python2 and python3 binaries together. - Bugfix: errors in external pillar causes crash instead of report of them (bsc#1068446) - Fix 'user.present' when 'gid_from_name' is set but group does not exist. - Added: * bugfix-the-logic-according-to-the-exact-described-pu.patch * return-error-when-gid_from_name-and-group-does-not-e.patch - Fix "No service execution module loaded" issue (bsc#1065792) - Set SHELL environment variable Added: * fix-bsc-1065792.patch * set-shell-environment-variable-64.patch - Removed unnecessary logging on shutdown (bsc#1050003) - Renamed patch that adds grain fqdns Changed: * catching-error-when-pidfile-cannot-be-deleted Removed: * fix-for-pidfile-removal-logging Renamed: * add-fqdns-grains -> feat-add-grain-for-all-fqdns OBS-URL: https://build.opensuse.org/request/show/569868 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=107
30 lines
899 B
Diff
30 lines
899 B
Diff
From 418bcf80ca263c5523e701801e97bae60fdf9b35 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Mon, 11 Sep 2017 19:57:28 +0200
|
|
Subject: [PATCH] Use $HOME to get the user home directory instead using
|
|
'~' char
|
|
|
|
---
|
|
pkg/salt.bash | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pkg/salt.bash b/pkg/salt.bash
|
|
index 480361fe23..00174c072f 100644
|
|
--- a/pkg/salt.bash
|
|
+++ b/pkg/salt.bash
|
|
@@ -35,7 +35,8 @@ _salt_get_keys(){
|
|
}
|
|
|
|
_salt(){
|
|
- local _salt_cache_functions=${SALT_COMP_CACHE_FUNCTIONS:='~/.cache/salt-comp-cache_functions'}
|
|
+ CACHE_DIR="$HOME/.cache/salt-comp-cache_functions"
|
|
+ local _salt_cache_functions=${SALT_COMP_CACHE_FUNCTIONS:=$CACHE_DIR}
|
|
local _salt_cache_timeout=${SALT_COMP_CACHE_TIMEOUT:='last hour'}
|
|
|
|
if [ ! -d "$(dirname ${_salt_cache_functions})" ]; then
|
|
--
|
|
2.15.1
|
|
|
|
|