From 17d8e7e3e293e8457f8d26202824c884e48164724184c0c0cc9bc5307edfcb6e Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 4 Jun 2024 14:07:43 +0000 Subject: [PATCH 1/2] Accepting request 1178500 from home:schubi2 - Update to version 0.7.0: * Defining manual parsing directories (#209) * parsing config files in python style * econf_readConfig: set usr_subdir to empty string if it is NULL * Fix static analyzer detected issues (#202) * comment string can be in the parsed value which is defined with quotes (#207) * tst-comments2: comment sign in quoted string (#205) * Setting options via new econf_newKeyFile_with_options. (#206) - Update to version 0.7.0: * Defining manual parsing directories (#209) * parsing config files in python style * econf_readConfig: set usr_subdir to empty string if it is NULL * Fix static analyzer detected issues (#202) * comment string can be in the parsed value which is defined with quotes (#207) * tst-comments2: comment sign in quoted string (#205) * Setting options via new econf_newKeyFile_with_options. (#206) OBS-URL: https://build.opensuse.org/request/show/1178500 OBS-URL: https://build.opensuse.org/package/show/devel:microos/libeconf?expand=0&rev=27 --- _servicedata | 2 +- libeconf-0.6.3.tar.xz | 3 --- libeconf-0.7.0.tar.xz | 3 +++ libeconf.changes | 12 ++++++++++++ libeconf.spec | 2 +- python-libeconf.changes | 12 ++++++++++++ python-libeconf.spec | 2 +- 7 files changed, 30 insertions(+), 6 deletions(-) delete mode 100644 libeconf-0.6.3.tar.xz create mode 100644 libeconf-0.7.0.tar.xz diff --git a/_servicedata b/_servicedata index 2833484..a6ebae9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/libeconf.git - c42c2e62f715e45835576b1580f590cfbfac1c34 + 5ed46a491049e02405fbc39d81c77e90ff55ba13 \ No newline at end of file diff --git a/libeconf-0.6.3.tar.xz b/libeconf-0.6.3.tar.xz deleted file mode 100644 index 79d584b..0000000 --- a/libeconf-0.6.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdd165b3920310feb0fb1cbf17afbf40ade3845a78393b93f7d964f8b2c52ace -size 171812 diff --git a/libeconf-0.7.0.tar.xz b/libeconf-0.7.0.tar.xz new file mode 100644 index 0000000..89c40f0 --- /dev/null +++ b/libeconf-0.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7758ef4372388d32e7a233b5579f76bf3ad88fca5676414454a76577f6c29aa +size 176112 diff --git a/libeconf.changes b/libeconf.changes index 5dc6b63..ac6a543 100644 --- a/libeconf.changes +++ b/libeconf.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 04 11:08:28 UTC 2024 - schubi@suse.com + +- Update to version 0.7.0: + * Defining manual parsing directories (#209) + * parsing config files in python style + * econf_readConfig: set usr_subdir to empty string if it is NULL + * Fix static analyzer detected issues (#202) + * comment string can be in the parsed value which is defined with quotes (#207) + * tst-comments2: comment sign in quoted string (#205) + * Setting options via new econf_newKeyFile_with_options. (#206) + ------------------------------------------------------------------- Fri Apr 12 10:47:39 UTC 2024 - schubi@suse.com diff --git a/libeconf.spec b/libeconf.spec index 9e45f3a..4d8a536 100644 --- a/libeconf.spec +++ b/libeconf.spec @@ -18,7 +18,7 @@ %define lname libeconf0 Name: libeconf -Version: 0.6.3 +Version: 0.7.0 Release: 0 Summary: Enhanced config file parser ala systemd License: LGPL-2.1-or-later diff --git a/python-libeconf.changes b/python-libeconf.changes index 7be0d85..12c4200 100644 --- a/python-libeconf.changes +++ b/python-libeconf.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 04 11:08:28 UTC 2024 - schubi@suse.com + +- Update to version 0.7.0: + * Defining manual parsing directories (#209) + * parsing config files in python style + * econf_readConfig: set usr_subdir to empty string if it is NULL + * Fix static analyzer detected issues (#202) + * comment string can be in the parsed value which is defined with quotes (#207) + * tst-comments2: comment sign in quoted string (#205) + * Setting options via new econf_newKeyFile_with_options. (#206) + ------------------------------------------------------------------- Fri Apr 12 10:47:39 UTC 2024 - schubi@suse.com diff --git a/python-libeconf.spec b/python-libeconf.spec index 86a1b56..376f225 100644 --- a/python-libeconf.spec +++ b/python-libeconf.spec @@ -19,7 +19,7 @@ %{?sle15_python_module_pythons} %define skip_python39 1 Name: python-libeconf -Version: 0.6.3 +Version: 0.7.0 Release: 0 Summary: Python bindings for libeconf License: LGPL-2.1-or-later From a395cec6a271b36bebe96c6456eaa33f7ccc042c5fd8ddfa52db558694c6f776 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 10 Jun 2024 08:10:26 +0000 Subject: [PATCH 2/2] Accepting request 1179642 from home:schubi2:branches:devel:microos - Update to version 0.7.1: * Improved error handling while parsing values with the wrong format. Added new return value ECONF_VALUE_CONVERSION_ERROR. * Setting parsing options via econf_file struct. see econf_newKeyFile_with_options. These options will be used by econf_readConfig and econf_readConfigWithCallback. Following options are supported: JOIN_SAME_ENTRIES (default 0) Parsed entries with the same name will not be replaces but will be joined to one entry. PYTHON_STYLE (default 0) E.G. Identations will be handled like multiline entries. PARSING_DIRS (default /usr/etc/:/run:/etc) List of directories from which the configuration files have to be parsed. The list is a string, divides by ":". The last entry has the highest priority. E.g.: "PARSING_DIRS=/usr/etc/:/run:/etc" CONFIG_DIRS (default ) List of directory structures (with order) which describes the directories in which the files have to be parsed. The list is a string, divides by ":". The last entry has the highest priority. E.g. with the given list: "CONFIG_DIRS=.conf.d:.d" files in following directories will be parsed: "/.conf.d/" "/.d/" "//" * CAUTION: From now on every econf_file element MUST be intialized if econf_readConfig and econf_readConfigWithCallback is used. Either with NULL or: econf_file *key_file = NULL; if (error = econf_newKeyFile_with_options(&key_file, "PYTHON_STYLE=1")) { fprintf (stderr, "ERROR: couldn't create new key file: %s\n", econf_errString(error)); return 1; } error = econf_readConfig (&key_file, "foo", "/usr/lib", "example", "conf", "=", "#"); - Update to version 0.7.1: * Improved error handling while parsing values with the wrong format. Added new return value ECONF_VALUE_CONVERSION_ERROR. * Setting parsing options via econf_file struct. see econf_newKeyFile_with_options. These options will be used by econf_readConfig and econf_readConfigWithCallback. Following options are supported: JOIN_SAME_ENTRIES (default 0) Parsed entries with the same name will not be replaces but will be joined to one entry. PYTHON_STYLE (default 0) E.G. Identations will be handled like multiline entries. PARSING_DIRS (default /usr/etc/:/run:/etc) List of directories from which the configuration files have to be parsed. The list is a string, divides by ":". The last entry has the highest priority. E.g.: "PARSING_DIRS=/usr/etc/:/run:/etc" CONFIG_DIRS (default ) List of directory structures (with order) which describes the directories in which the files have to be parsed. The list is a string, divides by ":". The last entry has the highest priority. E.g. with the given list: "CONFIG_DIRS=.conf.d:.d" files in following directories will be parsed: "/.conf.d/" "/.d/" "//" * CAUTION: From now on every econf_file element MUST be intialized if econf_readConfig and econf_readConfigWithCallback is used. Either with NULL or: econf_file *key_file = NULL; if (error = econf_newKeyFile_with_options(&key_file, "PYTHON_STYLE=1")) { fprintf (stderr, "ERROR: couldn't create new key file: %s\n", econf_errString(error)); return 1; } error = econf_readConfig (&key_file, "foo", "/usr/lib", "example", "conf", "=", "#"); OBS-URL: https://build.opensuse.org/request/show/1179642 OBS-URL: https://build.opensuse.org/package/show/devel:microos/libeconf?expand=0&rev=28 --- _servicedata | 2 +- libeconf-0.7.0.tar.xz | 3 --- libeconf-0.7.1.tar.xz | 3 +++ libeconf.changes | 45 +++++++++++++++++++++++++++++++++++++++++ libeconf.spec | 2 +- python-libeconf.changes | 45 +++++++++++++++++++++++++++++++++++++++++ python-libeconf.spec | 2 +- 7 files changed, 96 insertions(+), 6 deletions(-) delete mode 100644 libeconf-0.7.0.tar.xz create mode 100644 libeconf-0.7.1.tar.xz diff --git a/_servicedata b/_servicedata index a6ebae9..f73fb8d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/libeconf.git - 5ed46a491049e02405fbc39d81c77e90ff55ba13 + ccaf9121a8d15a043509af6e6545925b7e82a270 \ No newline at end of file diff --git a/libeconf-0.7.0.tar.xz b/libeconf-0.7.0.tar.xz deleted file mode 100644 index 89c40f0..0000000 --- a/libeconf-0.7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7758ef4372388d32e7a233b5579f76bf3ad88fca5676414454a76577f6c29aa -size 176112 diff --git a/libeconf-0.7.1.tar.xz b/libeconf-0.7.1.tar.xz new file mode 100644 index 0000000..57fb85c --- /dev/null +++ b/libeconf-0.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff65f21c2773d2c6a92102ae56152793d0b5e2a0e0b9bbd18f0aedc40d388d6 +size 176544 diff --git a/libeconf.changes b/libeconf.changes index ac6a543..a86dc2d 100644 --- a/libeconf.changes +++ b/libeconf.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Mon Jun 10 07:36:06 UTC 2024 - schubi@suse.com + +- Update to version 0.7.1: +* Improved error handling while parsing values with the wrong format. + Added new return value ECONF_VALUE_CONVERSION_ERROR. +* Setting parsing options via econf_file struct. + see econf_newKeyFile_with_options. These options will be used by + econf_readConfig and econf_readConfigWithCallback. + Following options are supported: + JOIN_SAME_ENTRIES (default 0) + Parsed entries with the same name will not be replaces but + will be joined to one entry. + PYTHON_STYLE (default 0) + E.G. Identations will be handled like multiline entries. + PARSING_DIRS (default /usr/etc/:/run:/etc) + List of directories from which the configuration files have to be parsed. + The list is a string, divides by ":". The last entry has the highest + priority. E.g.: "PARSING_DIRS=/usr/etc/:/run:/etc" + CONFIG_DIRS (default ) + List of directory structures (with order) which describes the directories + in which the files have to be parsed. + The list is a string, divides by ":". The last entry has the highest + priority. E.g. with the given list: "CONFIG_DIRS=.conf.d:.d" files in + following directories will be parsed: + "/.conf.d/" + "/.d/" + "//" +* CAUTION: From now on every econf_file element MUST be intialized if + econf_readConfig and econf_readConfigWithCallback is used. + Either with NULL or: + econf_file *key_file = NULL; + if (error = econf_newKeyFile_with_options(&key_file, "PYTHON_STYLE=1")) + { + fprintf (stderr, "ERROR: couldn't create new key file: %s\n", + econf_errString(error)); + return 1; + } + error = econf_readConfig (&key_file, + "foo", + "/usr/lib", + "example", + "conf", + "=", "#"); + ------------------------------------------------------------------- Tue Jun 04 11:08:28 UTC 2024 - schubi@suse.com diff --git a/libeconf.spec b/libeconf.spec index 4d8a536..5c23c0f 100644 --- a/libeconf.spec +++ b/libeconf.spec @@ -18,7 +18,7 @@ %define lname libeconf0 Name: libeconf -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Enhanced config file parser ala systemd License: LGPL-2.1-or-later diff --git a/python-libeconf.changes b/python-libeconf.changes index 12c4200..337bfe7 100644 --- a/python-libeconf.changes +++ b/python-libeconf.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Mon Jun 10 07:36:06 UTC 2024 - schubi@suse.com + +- Update to version 0.7.1: +* Improved error handling while parsing values with the wrong format. + Added new return value ECONF_VALUE_CONVERSION_ERROR. +* Setting parsing options via econf_file struct. + see econf_newKeyFile_with_options. These options will be used by + econf_readConfig and econf_readConfigWithCallback. + Following options are supported: + JOIN_SAME_ENTRIES (default 0) + Parsed entries with the same name will not be replaces but + will be joined to one entry. + PYTHON_STYLE (default 0) + E.G. Identations will be handled like multiline entries. + PARSING_DIRS (default /usr/etc/:/run:/etc) + List of directories from which the configuration files have to be parsed. + The list is a string, divides by ":". The last entry has the highest + priority. E.g.: "PARSING_DIRS=/usr/etc/:/run:/etc" + CONFIG_DIRS (default ) + List of directory structures (with order) which describes the directories + in which the files have to be parsed. + The list is a string, divides by ":". The last entry has the highest + priority. E.g. with the given list: "CONFIG_DIRS=.conf.d:.d" files in + following directories will be parsed: + "/.conf.d/" + "/.d/" + "//" +* CAUTION: From now on every econf_file element MUST be intialized if + econf_readConfig and econf_readConfigWithCallback is used. + Either with NULL or: + econf_file *key_file = NULL; + if (error = econf_newKeyFile_with_options(&key_file, "PYTHON_STYLE=1")) + { + fprintf (stderr, "ERROR: couldn't create new key file: %s\n", + econf_errString(error)); + return 1; + } + error = econf_readConfig (&key_file, + "foo", + "/usr/lib", + "example", + "conf", + "=", "#"); + ------------------------------------------------------------------- Tue Jun 04 11:08:28 UTC 2024 - schubi@suse.com diff --git a/python-libeconf.spec b/python-libeconf.spec index 376f225..3b0f57d 100644 --- a/python-libeconf.spec +++ b/python-libeconf.spec @@ -19,7 +19,7 @@ %{?sle15_python_module_pythons} %define skip_python39 1 Name: python-libeconf -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Python bindings for libeconf License: LGPL-2.1-or-later