2686359b2c
- Update to Salt release version 3006.0 (jsc#PED-3139) * See release notes: https://docs.saltproject.io/en/latest/topics/releases/3006.0.html - Add python3-looseversion as new dependency for salt - Add python3-packaging as new dependency for salt - Drop conflictive patch dicarded from upstream - Fix SLS rendering error when Jinja macros are used - Fix version detection and avoid building and testing failures - Added: * fix-version-detection-and-avoid-building-and-testing.patch * make-sure-the-file-client-is-destroyed-upon-used.patch - Modified: * 3005.1-implement-zypper-removeptf-573.patch * activate-all-beacons-sources-config-pillar-grains.patch * add-custom-suse-capabilities-as-grains.patch * add-environment-variable-to-know-if-yum-is-invoked-f.patch * add-migrated-state-and-gpg-key-management-functions-.patch * add-publish_batch-to-clearfuncs-exposed-methods.patch * add-salt-ssh-support-with-venv-salt-minion-3004-493.patch * add-sleep-on-exception-handling-on-minion-connection.patch * add-standalone-configuration-file-for-enabling-packa.patch * add-support-for-gpgautoimport-539.patch * allow-vendor-change-option-with-zypper.patch * async-batch-implementation.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * bsc-1176024-fix-file-directory-user-and-group-owners.patch * change-the-delimeters-to-prevent-possible-tracebacks.patch * control-the-collection-of-lvm-grains-via-config.patch * debian-info_installed-compatibility-50453.patch * dnfnotify-pkgset-plugin-implementation-3002.2-450.patch * do-not-load-pip-state-if-there-is-no-3rd-party-depen.patch * don-t-use-shell-sbin-nologin-in-requisites.patch * drop-serial-from-event.unpack-in-cli.batch_async.patch * early-feature-support-config.patch * enable-passing-a-unix_socket-for-mysql-returners-bsc.patch * enhance-openscap-module-add-xccdf_eval-call-386.patch * fix-bsc-1065792.patch * fix-for-suse-expanded-support-detection.patch * fix-issue-2068-test.patch * fix-missing-minion-returns-in-batch-mode-360.patch * fix-ownership-of-salt-thin-directory-when-using-the-.patch * fix-regression-with-depending-client.ssh-on-psutil-b.patch * fix-salt-ssh-opts-poisoning-bsc-1197637-3004-501.patch * fix-salt.utils.stringutils.to_str-calls-to-make-it-w.patch * fix-the-regression-for-yumnotify-plugin-456.patch * fix-traceback.print_exc-calls-for-test_pip_state-432.patch * fixes-for-python-3.10-502.patch * include-aliases-in-the-fqdns-grains.patch * info_installed-works-without-status-attr-now.patch * let-salt-ssh-use-platform-python-binary-in-rhel8-191.patch * make-aptpkg.list_repos-compatible-on-enabled-disable.patch * make-setup.py-script-to-not-require-setuptools-9.1.patch * pass-the-context-to-pillar-ext-modules.patch * prevent-affection-of-ssh.opts-with-lazyloader-bsc-11.patch * prevent-pkg-plugins-errors-on-missing-cookie-path-bs.patch * prevent-shell-injection-via-pre_flight_script_args-4.patch * read-repo-info-without-using-interpolation-bsc-11356.patch * restore-default-behaviour-of-pkg-list-return.patch * return-the-expected-powerpc-os-arch-bsc-1117995.patch * revert-fixing-a-use-case-when-multiple-inotify-beaco.patch * run-salt-api-as-user-salt-bsc-1064520.patch * run-salt-master-as-dedicated-salt-user.patch * save-log-to-logfile-with-docker.build.patch * skip-package-names-without-colon-bsc-1208691-578.patch * switch-firewalld-state-to-use-change_interface.patch * temporary-fix-extend-the-whitelist-of-allowed-comman.patch * update-target-fix-for-salt-ssh-to-process-targets-li.patch * use-adler32-algorithm-to-compute-string-checksums.patch * use-rlock-to-avoid-deadlocks-in-salt-ssh.patch * use-salt-bundle-in-dockermod.patch * x509-fixes-111.patch * zypperpkg-ignore-retcode-104-for-search-bsc-1176697-.patch - Removed: * add-amazon-ec2-detection-for-virtual-grains-bsc-1195.patch * add-support-for-name-pkgs-and-diff_attr-parameters-t.patch * align-amazon-ec2-nitro-grains-with-upstream-pr-bsc-1.patch * allow-entrypoint-compatibility-for-importlib-metadat.patch * clarify-pkg.installed-pkg_verify-documentation.patch * detect-module.run-syntax.patch * fix-salt.states.file.managed-for-follow_symlinks-tru.patch * fix-state.apply-in-test-mode-with-file-state-module-.patch * fix-test_ipc-unit-tests.patch * fixes-pkg.version_cmp-on-openeuler-systems-and-a-few.patch * fopen-workaround-bad-buffering-for-binary-mode-563.patch * ignore-erros-on-reading-license-files-with-dpkg_lowp.patch * ignore-extend-declarations-from-excluded-sls-files.patch * ignore-non-utf8-characters-while-reading-files-with-.patch * include-stdout-in-error-message-for-zypperpkg-559.patch * make-pass-renderer-configurable-other-fixes-532.patch * make-sure-saltcacheloader-use-correct-fileclient-519.patch * normalize-package-names-once-with-pkg.installed-remo.patch * retry-if-rpm-lock-is-temporarily-unavailable-547.patch * set-default-target-for-pip-from-venv_pip_target-envi.patch * state.apply-don-t-check-for-cached-pillar-errors.patch * state.orchestrate_single-does-not-pass-pillar-none-4.patch OBS-URL: https://build.opensuse.org/request/show/1084999 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=210
103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
From 4240f0d5ffbc46c557885c5a28d1f2fd0b4c5e48 Mon Sep 17 00:00:00 2001
|
|
From: Victor Zhestkov <35733135+vzhestkov@users.noreply.github.com>
|
|
Date: Mon, 8 Nov 2021 17:42:36 +0300
|
|
Subject: [PATCH] Prevent pkg plugins errors on missing cookie path
|
|
(bsc#1186738) - 3002.2 (#415)
|
|
|
|
* Prevent pkg plugins errors on missing cookie path (bsc#1186738)
|
|
|
|
* Narrowing down exception handling
|
|
|
|
* Modify for Python 3 only
|
|
|
|
* Fix yumnotify
|
|
---
|
|
scripts/suse/yum/plugins/README.md | 2 +-
|
|
scripts/suse/yum/plugins/yumnotify.py | 17 +++++++++++++----
|
|
scripts/suse/zypper/plugins/commit/zyppnotify | 18 ++++++++++++------
|
|
3 files changed, 26 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/scripts/suse/yum/plugins/README.md b/scripts/suse/yum/plugins/README.md
|
|
index cb3abd2260..3515845b31 100644
|
|
--- a/scripts/suse/yum/plugins/README.md
|
|
+++ b/scripts/suse/yum/plugins/README.md
|
|
@@ -11,7 +11,7 @@ Configuration files are going to:
|
|
|
|
Plugin itself goes to:
|
|
|
|
- `/usr/share/yum-plugins/[name].conf`
|
|
+ `/usr/share/yum-plugins/[name].py`
|
|
|
|
## Permissions
|
|
|
|
diff --git a/scripts/suse/yum/plugins/yumnotify.py b/scripts/suse/yum/plugins/yumnotify.py
|
|
index 4e137191a0..0d117e8946 100644
|
|
--- a/scripts/suse/yum/plugins/yumnotify.py
|
|
+++ b/scripts/suse/yum/plugins/yumnotify.py
|
|
@@ -5,6 +5,7 @@
|
|
|
|
import hashlib
|
|
import os
|
|
+import sys
|
|
|
|
from yum.plugins import TYPE_CORE
|
|
|
|
@@ -51,7 +52,15 @@ def posttrans_hook(conduit):
|
|
"""
|
|
# Integrate Yum with Salt
|
|
if "SALT_RUNNING" not in os.environ:
|
|
- with open(CK_PATH, "w") as ck_fh:
|
|
- ck_fh.write(
|
|
- "{chksum} {mtime}\n".format(chksum=_get_checksum(), mtime=_get_mtime())
|
|
- )
|
|
+ try:
|
|
+ ck_dir = os.path.dirname(CK_PATH)
|
|
+ if not os.path.exists(ck_dir):
|
|
+ os.makedirs(ck_dir)
|
|
+ with open(CK_PATH, "w") as ck_fh:
|
|
+ ck_fh.write(
|
|
+ "{chksum} {mtime}\n".format(
|
|
+ chksum=_get_checksum(), mtime=_get_mtime()
|
|
+ )
|
|
+ )
|
|
+ except OSError as e:
|
|
+ print("Unable to save the cookie file: %s" % (e), file=sys.stderr)
|
|
diff --git a/scripts/suse/zypper/plugins/commit/zyppnotify b/scripts/suse/zypper/plugins/commit/zyppnotify
|
|
index bacbc8b97e..e3528e87a9 100755
|
|
--- a/scripts/suse/zypper/plugins/commit/zyppnotify
|
|
+++ b/scripts/suse/zypper/plugins/commit/zyppnotify
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
#
|
|
# Copyright (c) 2016 SUSE Linux LLC
|
|
# All Rights Reserved.
|
|
@@ -55,12 +55,18 @@ class DriftDetector(Plugin):
|
|
Hook when plugin closes Zypper's transaction.
|
|
"""
|
|
if "SALT_RUNNING" not in os.environ:
|
|
- with open(self.ck_path, "w") as ck_fh:
|
|
- ck_fh.write(
|
|
- "{chksum} {mtime}\n".format(
|
|
- chksum=self._get_checksum(), mtime=self._get_mtime()
|
|
+ try:
|
|
+ ck_dir = os.path.dirname(self.ck_path)
|
|
+ if not os.path.exists(ck_dir):
|
|
+ os.makedirs(ck_dir)
|
|
+ with open(self.ck_path, "w") as ck_fh:
|
|
+ ck_fh.write(
|
|
+ "{chksum} {mtime}\n".format(
|
|
+ chksum=self._get_checksum(), mtime=self._get_mtime()
|
|
+ )
|
|
)
|
|
- )
|
|
+ except OSError as e:
|
|
+ print("Unable to save the cookie file: %s" % (e), file=sys.stderr)
|
|
|
|
self.ack()
|
|
|
|
--
|
|
2.39.2
|
|
|
|
|