34c91909fc
- Prevent queryformat pattern from expanding (bsc#1079048) - Fix epoch handling for Rhel 6 and 7 (bsc#1068566) - Reverting to current API for split_input - Added: * yumpkg-don-t-use-diff_attr-when-determining-install-.patch - Removed: * fix-for-wrong-version-processing.patch - Fix for wrong version processing during yum pkg install (bsc#1068566) - Older logrotate need su directive (bsc#1071322) OBS-URL: https://build.opensuse.org/request/show/573717 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=110
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.13.6
|
|
|
|
|