Merge pull request #179 from yast/fix_commit_params_master

yast · Sep 14, 2023 · b9d41f4 · b9d41f4
2 parents 8ac4bc4 + b0dfcfb
commit b9d41f4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/package/yast2-pkg-bindings.changes b/package/yast2-pkg-bindings.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 13 16:36:53 UTC 2023 - Ladislav Slezák <[email protected]>
+
+- Fixed crash in the Pkg.Commit() function when passing
+  "exclude_docs" or "no_signature" options (bsc#1215238)
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]>
 

diff --git a/package/yast2-pkg-bindings.spec b/package/yast2-pkg-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        5.0.0
+Version:        5.0.1
 Release:        0
 Summary:        YaST2 - Package Manager Access
 License:        GPL-2.0-only

diff --git 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;