Hello community, here is the log from the commit of package yast2-xml for openSUSE:Factory checked in at 2019-10-27 13:35:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-xml (Old) and /work/SRC/openSUSE:Factory/.yast2-xml.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-xml" Sun Oct 27 13:35:46 2019 rev:25 rq:742139 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-xml/yast2-xml.changes 2019-02-28 21:48:23.617397237 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-xml.new.2990/yast2-xml.changes 2019-10-27 13:35:48.992875543 +0100 @@ -1,0 +2,7 @@ +Wed Oct 16 13:36:00 UTC 2019 - Knut Anderssen <[email protected]> + +- Return string instead of Boolean when calling Execute with + .xml.string (bsc#1153539) +- 4.1.1 + +------------------------------------------------------------------- Old: ---- yast2-xml-4.1.0.tar.bz2 New: ---- yast2-xml-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-xml.spec ++++++ --- /var/tmp/diff_new_pack.K3MtGw/_old 2019-10-27 13:35:50.324877240 +0100 +++ /var/tmp/diff_new_pack.K3MtGw/_new 2019-10-27 13:35:50.356877281 +0100 @@ -17,7 +17,7 @@ Name: yast2-xml -Version: 4.1.0 +Version: 4.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-xml-4.1.0.tar.bz2 -> yast2-xml-4.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-xml-4.1.0/.editorconfig new/yast2-xml-4.1.1/.editorconfig --- old/yast2-xml-4.1.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-xml-4.1.1/.editorconfig 2019-10-23 14:51:17.000000000 +0200 @@ -0,0 +1,15 @@ +# https://EditorConfig.org -*- ini -*- +# This is a unified way to tell all your editors +# about the proper indentation style in this repo. +# +# Emacs: https://github.com/editorconfig/editorconfig-emacs#readme +# Vim: https://github.com/editorconfig/editorconfig-vim#readme +# VS Code: https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig + +# don't continue looking in upper directories, this is the top level +root = true + +[*.{h,cc}] +indent_style = tab +indent_size = 4 +tab_width = 8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-xml-4.1.0/Dockerfile new/yast2-xml-4.1.1/Dockerfile --- old/yast2-xml-4.1.0/Dockerfile 2019-02-27 15:47:52.000000000 +0100 +++ new/yast2-xml-4.1.1/Dockerfile 2019-10-23 14:51:17.000000000 +0200 @@ -1,4 +1,4 @@ -FROM yastdevel/cpp +FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ libxml2-devel COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-xml-4.1.0/package/yast2-xml.changes new/yast2-xml-4.1.1/package/yast2-xml.changes --- old/yast2-xml-4.1.0/package/yast2-xml.changes 2019-02-27 15:47:52.000000000 +0100 +++ new/yast2-xml-4.1.1/package/yast2-xml.changes 2019-10-23 14:51:17.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 16 13:36:00 UTC 2019 - Knut Anderssen <[email protected]> + +- Return string instead of Boolean when calling Execute with + .xml.string (bsc#1153539) +- 4.1.1 + +------------------------------------------------------------------- Tue Feb 26 14:17:57 UTC 2019 - José Iván López González <[email protected]> - Version bump (bsc#1124009) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-xml-4.1.0/package/yast2-xml.spec new/yast2-xml-4.1.1/package/yast2-xml.spec --- old/yast2-xml-4.1.0/package/yast2-xml.spec 2019-02-27 15:47:52.000000000 +0100 +++ new/yast2-xml-4.1.1/package/yast2-xml.spec 2019-10-23 14:51:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-xml -Version: 4.1.0 +Version: 4.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-xml-4.1.0/src/XmlAgent.cc new/yast2-xml-4.1.1/src/XmlAgent.cc --- old/yast2-xml-4.1.0/src/XmlAgent.cc 2019-02-27 15:47:52.000000000 +0100 +++ new/yast2-xml-4.1.1/src/XmlAgent.cc 2019-10-23 14:51:17.000000000 +0200 @@ -850,21 +850,15 @@ YCPValue result = YCPVoid(); int size; - const char * input = ""; - const char *content = ""; + bool string_output = false; xmlDocPtr doc, newDoc; xmlChar *mem; for (int i=0; i<path->length(); i++) { - if (path->component_str (i)=="xmlrpc") - { - content = (const char *)path->component_str (i).c_str(); - } - else if (path->component_str (i) == "string") { - input = (const char *)path->component_str (i).c_str(); - } + if (path->component_str (i) == "string") + string_output = true; } YCPMap argMap = arg->asMap(); @@ -885,9 +879,9 @@ { filename = fileName; } - else if (input && *input) + else if (string_output) { - y2milestone("String handling"); + y2milestone("String handling"); } else { @@ -898,56 +892,47 @@ doc = xmlNewDoc((const xmlChar *)"1.0"); - if (!strcmp(content,"xmlrpc")) + xmlNodePtr root = xmlNewDocNode(doc, NULL, (const xmlChar *)rootElement, NULL); + xmlDocSetRootElement (doc, root); + + if (nameSpace && *nameSpace) { - y2milestone("XML-RPC handling"); - doc->children = xmlNewDocNode(doc, NULL, (const xmlChar *)"methodCall", NULL); - newDoc = ParseYCPMethodCall(argMap, doc); + xmlNewNs (root, (const xmlChar *)nameSpace, NULL); } - else - { - xmlNodePtr root = xmlNewDocNode(doc, NULL, (const xmlChar *)rootElement, NULL); - xmlDocSetRootElement (doc, root); - if (nameSpace && *nameSpace) - { - xmlNewNs (root, (const xmlChar *)nameSpace, NULL); - } - - if (typeNS && *typeNS) { - configNamespace = xmlNewNs (root, (const xmlChar *)typeNS, (const xmlChar *)"config"); - } - else { - configNamespace = NULL; - } - - - doc->children = ParseYCPMap(argMap, root, doc); - doc->intSubset = xmlCreateIntSubset (doc, - (const xmlChar *)rootElement, - NULL, - (const xmlChar *)( strlen(systemID)>0 ? systemID : NULL )); - newDoc = xmlCopyDoc (doc,1); + if (typeNS && *typeNS) { + configNamespace = xmlNewNs (root, (const xmlChar *)typeNS, (const xmlChar *)"config"); } + else { + configNamespace = NULL; + } + + + doc->children = ParseYCPMap(argMap, root, doc); + doc->intSubset = xmlCreateIntSubset (doc, + (const xmlChar *)rootElement, + NULL, + (const xmlChar *)( strlen(systemID)>0 ? systemID : NULL )); + + newDoc = xmlCopyDoc (doc,1); + xmlIndentTreeOutput = 1; - xmlKeepBlanksDefault (0); + xmlKeepBlanksDefault (0); - if (!strcmp(input,"string")) + if (string_output) { - xmlDocDumpFormatMemory (newDoc, &mem, &size, 1); + xmlDocDumpFormatMemory (newDoc, &mem, &size, 1); - result = YCPString((const char *)mem); + result = YCPString((const char *)mem); - xmlFree(mem); + xmlFree(mem); + xmlFreeDoc(doc); } else { - result = YCPBoolean( xmlSaveFormatFile(filename, newDoc, 1) != -1 ); - } - xmlFreeDoc(doc); - if (strcmp(input,"string")) - { - xmlFreeDoc(newDoc); + result = YCPBoolean( xmlSaveFormatFile(filename, newDoc, 1) != -1 ); + xmlFreeDoc(doc); + xmlFreeDoc(newDoc); } return result; }
