Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2025-03-20 19:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Thu Mar 20 19:23:49 2025 rev:169 rq:1254424 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2025-03-11 20:44:36.484415765 +0100 +++ /work/SRC/openSUSE:Factory/.salt.new.2696/salt.changes 2025-03-20 19:24:00.855212978 +0100 @@ -1,0 +2,8 @@ +Wed Mar 12 13:38:35 UTC 2025 - Marek Czernek <marek.czer...@suse.com> + +- Fix aptpkg 'NoneType object has no attribute split' error + +- Added: + * fix-deb822-nonetype-object-has-no-attribute-split-71.patch + +------------------------------------------------------------------- New: ---- fix-deb822-nonetype-object-has-no-attribute-split-71.patch BETA DEBUG BEGIN: New:- Added: * fix-deb822-nonetype-object-has-no-attribute-split-71.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.yeXVu4/_old 2025-03-20 19:24:03.867337467 +0100 +++ /var/tmp/diff_new_pack.yeXVu4/_new 2025-03-20 19:24:03.871337633 +0100 @@ -538,6 +538,8 @@ Patch166: ensure-the-correct-crypt-module-is-loaded.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/67796 Patch167: detect-openeuler-as-redhat-family-os.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/710 +Patch168: fix-deb822-nonetype-object-has-no-attribute-split-71.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.yeXVu4/_old 2025-03-20 19:24:03.983342262 +0100 +++ /var/tmp/diff_new_pack.yeXVu4/_new 2025-03-20 19:24:03.987342427 +0100 @@ -1,3 +1,3 @@ -645a3a816de8a50f762a7e8f9dec21ee3c10aaf0 +e615b76c6ed90ed034fb44267b74965fb10b2994 (No newline at EOF) ++++++ fix-deb822-nonetype-object-has-no-attribute-split-71.patch ++++++ >From ac77a2e4ac4b3e2019efeeb5fce8a61d649b4f6c Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czer...@suse.com> Date: Wed, 12 Mar 2025 14:27:36 +0100 Subject: [PATCH] Fix DEB822 'NoneType' object has no attribute 'split' (#710) --- salt/modules/aptpkg.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py index 48d2ccb904..8244c639e8 100644 --- a/salt/modules/aptpkg.py +++ b/salt/modules/aptpkg.py @@ -2807,7 +2807,9 @@ def mod_repo(repo, saltenv="base", aptkey=True, **kwargs): if not invalid: repos.append(source) else: - if HAS_DEB822 and source.types == [""]: + if HAS_DEB822 and ( + source.types == [""] or not bool(source.types) or not source.type + ): # most probably invalid or comment line continue repos.append(source) @@ -2991,8 +2993,10 @@ def mod_repo(repo, saltenv="base", aptkey=True, **kwargs): kwargs["comments"] = salt.utils.pkg.deb.combine_comments(kwargs["comments"]) if not mod_source: - if HAS_DEB822: - apt_source_file = kwargs.get("file") + apt_source_file = kwargs.get("file") + if not apt_source_file: + raise SaltInvocationError("missing 'file' argument when defining a new repository") + if HAS_DEB822 and not apt_source_file.endswith(".list"): section = _deb822.Section("") section["Types"] = repo_type section["URIs"] = repo_uri -- 2.48.1
