de2af4d74d
The upstream commit 1e422ed of python-keyring moved non-preferred keyring backends to separated package "keyrings.alt", so adding the keyrings.alt and porting the patches related to non-preferred keyring backends to keyrings.alt. Patches are not up to our standard. Bringing them up to standard is future work, tracked by: https://bugs.launchpad.net/starlingx/+bug/1950506. Related-Bug: 1950506 Building successfully. Installing python3-keyrings.alt, python3-keyring and the dependence package tsconfig successfully. Booting up ISO successfully on qemu. Story: 2009221 Task: 43438 Signed-off-by: Yue Tao <yue.tao@windriver.com> Change-Id: I4b70927709f0cc968e32af1d0e2a9402f47b2fe9
24 lines
699 B
Diff
24 lines
699 B
Diff
---
|
|
keyring/util/platform_.py | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/keyring/util/platform_.py
|
|
+++ b/keyring/util/platform_.py
|
|
@@ -1,5 +1,6 @@
|
|
import os
|
|
import platform
|
|
+from tsconfig.tsconfig import SW_VERSION
|
|
|
|
|
|
def _settings_root_XP():
|
|
@@ -21,7 +22,8 @@ def _data_root_Linux():
|
|
Use freedesktop.org Base Dir Specfication to determine storage
|
|
location.
|
|
"""
|
|
- fallback = os.path.expanduser('/opt/platform/.keyring/')
|
|
+ keyring_dir = os.path.join('/opt/platform/.keyring', SW_VERSION)
|
|
+ fallback = os.path.expanduser(keyring_dir)
|
|
root = os.environ.get('XDG_DATA_HOME', None) or fallback
|
|
return os.path.join(root, 'python_keyring')
|
|
|