From 1a5ef513ee5c7916cbcc3e13a4653ec008ee10e1 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 1 Sep 2023 22:25:40 +0200 Subject: [PATCH 1/2] Bump version to 4.6.0 --- package/yast2-pkg-bindings-devel-doc.changes | 5 +++++ package/yast2-pkg-bindings-devel-doc.spec | 2 +- package/yast2-pkg-bindings.changes | 5 +++++ package/yast2-pkg-bindings.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/yast2-pkg-bindings-devel-doc.changes b/package/yast2-pkg-bindings-devel-doc.changes index 2b00d73..9a11c69 100644 --- a/package/yast2-pkg-bindings-devel-doc.changes +++ b/package/yast2-pkg-bindings-devel-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger + +- Branch package for SP6 (bsc#1208913) + ------------------------------------------------------------------- Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slezák diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec index 25a6888..41923f0 100644 --- a/package/yast2-pkg-bindings-devel-doc.spec +++ b/package/yast2-pkg-bindings-devel-doc.spec @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 4.5.2 +Version: 4.6.0 Release: 0 Summary: YaST2 - Documentation for yast2-pkg-bindings package License: GPL-2.0-only diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes index 3c08c88..949ae70 100644 --- a/package/yast2-pkg-bindings.changes +++ b/package/yast2-pkg-bindings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger + +- Branch package for SP6 (bsc#1208913) + ------------------------------------------------------------------- Wed Apr 12 07:36:47 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec index 8a6c476..593c9fc 100644 --- a/package/yast2-pkg-bindings.spec +++ b/package/yast2-pkg-bindings.spec @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.5.2 +Version: 4.6.0 Release: 0 Summary: YaST2 - Package Manager Access License: GPL-2.0-only From d4d5c2b29e1ac2060d23c2e3fce4fc373c2d9cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 13 Sep 2023 17:35:07 +0200 Subject: [PATCH 2/2] Fixed crash in the Pkg.Commit() function (bsc#1215238) ... when passing "exclude_docs" or "no_signature" options - 4.6.1 --- package/yast2-pkg-bindings-devel-doc.spec | 2 +- package/yast2-pkg-bindings.changes | 7 +++++++ package/yast2-pkg-bindings.spec | 2 +- src/Package.cc | 12 ++++++------ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package/yast2-pkg-bindings-devel-doc.spec b/package/yast2-pkg-bindings-devel-doc.spec index 41923f0..43d97c9 100644 --- a/package/yast2-pkg-bindings-devel-doc.spec +++ b/package/yast2-pkg-bindings-devel-doc.spec @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: YaST2 - Documentation for yast2-pkg-bindings package License: GPL-2.0-only diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes index 949ae70..3e37ea9 100644 --- a/package/yast2-pkg-bindings.changes +++ b/package/yast2-pkg-bindings.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 13 15:09:36 UTC 2023 - Ladislav Slezák + +- Fixed crash in the Pkg.Commit() function when passing + "exclude_docs" or "no_signature" options (bsc#1215238) +- 4.6.1 + ------------------------------------------------------------------- Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec index 593c9fc..76f8080 100644 --- a/package/yast2-pkg-bindings.spec +++ b/package/yast2-pkg-bindings.spec @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: YaST2 - Package Manager Access License: GPL-2.0-only diff --git a/src/Package.cc b/src/Package.cc index 8363457..aa60cd5 100644 --- a/src/Package.cc +++ b/src/Package.cc @@ -2500,12 +2500,12 @@ YCPValue PkgFunctions::Commit (const YCPMap& config) bool exclude_docs = config->value(key)->asBoolean()->value(); commit_policy->rpmExcludeDocs(exclude_docs); - y2milestone("Excluding documentation: %s", config->value(key)->asString()->value().c_str()); + y2milestone("Excluding documentation: %s", config->value(key)->toString().c_str()); } else { - y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); - _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->asString()->value()); + y2error("Exclude documentation option: boolean is required, got: %s", config->value(key)->toString().c_str()); + _last_error.setLastError(std::string("Invalid exclude documentation option: ") + config->value(key)->toString()); delete commit_policy; commit_policy = NULL; @@ -2523,12 +2523,12 @@ YCPValue PkgFunctions::Commit (const YCPMap& config) bool no_signature = config->value(key)->asBoolean()->value(); commit_policy->rpmNoSignature(no_signature); - y2milestone("Don't check RPM signature: %s", config->value(key)->asString()->value().c_str()); + y2milestone("Don't check RPM signature: %s", config->value(key)->toString().c_str()); } else { - y2error("No signature option: boolean is required, got: %s", config->value(key)->asString()->value().c_str()); - _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->asString()->value()); + y2error("No signature option: boolean is required, got: %s", config->value(key)->toString().c_str()); + _last_error.setLastError(std::string("Invalid no signature option: ") + config->value(key)->toString()); delete commit_policy; commit_policy = NULL;