SHA256
1
0
forked from pool/salt
salt/use-home-to-get-the-user-home-directory-instead-usin.patch
Bo Maryniuk 08133114a1 Accepting request 533951 from systemsmanagement:saltstack:testing
- Add possibility to generate _version.py at the build time for
  raw builds: https://github.com/saltstack/salt/pull/43955
- Added:
  * enable-with-salt-version-parameter-for-setup.py-scri.patch

- Update to 2017.7.2
  See https://docs.saltstack.com/en/develop/topics/releases/2017.7.2.html
  for full changelog
- Fix for CVE-2017-14695 (bsc#1062462)
- Fix for CVE-2017-14696 (bsc#1062464)
- Fix salt target-type field returns "String" for existing 
  jids but an empty "Array" for non existing jids. (issue #1711)
- Added:
 * bugfix-always-return-a-string-list-on-unknown-job-ta.patch

- Fixed minion resource exhaustion when many functions are being
  executed in parallel (bsc#1059758)
- Added:
  * introduce-process_count_max-minion-configuration-par.patch
  * multiprocessing-minion-option-documentation-fixes.patch

- Remove 'TasksTask' attribute from salt-master.service in older
  versions of systemd (bsc#985112)
- Provide custom SUSE salt-master.service file.

- Fix wrong version reported by Salt (bsc#1061407)

- list_pkgs: add parameter for returned attribute selection (bsc#1052264)
- Adding the leftover for zypper and yum list_pkgs functionality.
- Use $HOME to get the user home directory instead using '~' char (bsc#1042749)

OBS-URL: https://build.opensuse.org/request/show/533951
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=96
2017-10-13 13:57:09 +00:00

30 lines
899 B
Diff

From 2dfd28560f3825dc512822ba9d01d67070d5175b 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.12.2