Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2021-01-18 11:27:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Mon Jan 18 11:27:48 2021 rev:290 rq:863301 version:7.0.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2021-01-08
17:34:17.285133915 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.28504/linuxrc.changes
2021-01-18 11:30:57.376601950 +0100
@@ -1,0 +2,7 @@
+Wed Jan 13 16:35:16 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#239
+- fix detection of config file type (XML vs. plain text) bsc#1179936
+- 7.0.24
+
+--------------------------------------------------------------------
Old:
----
linuxrc-7.0.23.tar.xz
New:
----
linuxrc-7.0.24.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.lnQFrv/_old 2021-01-18 11:30:58.156602718 +0100
+++ /var/tmp/diff_new_pack.lnQFrv/_new 2021-01-18 11:30:58.160602723 +0100
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 7.0.23
+Version: 7.0.24
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-7.0.23.tar.xz -> linuxrc-7.0.24.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.23/VERSION new/linuxrc-7.0.24/VERSION
--- old/linuxrc-7.0.23/VERSION 2021-01-07 13:58:48.000000000 +0100
+++ new/linuxrc-7.0.24/VERSION 2021-01-13 17:35:16.000000000 +0100
@@ -1 +1 @@
-7.0.23
+7.0.24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.23/changelog new/linuxrc-7.0.24/changelog
--- old/linuxrc-7.0.23/changelog 2021-01-07 13:58:48.000000000 +0100
+++ new/linuxrc-7.0.24/changelog 2021-01-13 17:35:16.000000000 +0100
@@ -1,3 +1,7 @@
+2021-01-13: 7.0.24
+ - merge gh#openSUSE/linuxrc#239
+ - fix detection of config file type (XML vs. plain text) bsc#1179936
+
2021-01-07: 7.0.23
- merge gh#openSUSE/linuxrc#237
- Since kernel 5.10, /sys/firmware/efi/vars has been dropped for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-7.0.23/file.c new/linuxrc-7.0.24/file.c
--- old/linuxrc-7.0.23/file.c 2021-01-07 13:58:48.000000000 +0100
+++ new/linuxrc-7.0.24/file.c 2021-01-13 17:35:16.000000000 +0100
@@ -606,31 +606,52 @@
*/
void file_do_info(file_t *f0, file_key_flag_t flags)
{
- file_t *f;
+ file_t *f, *xml_section_start = 0;
int i, is_xml = 0;
char buf[256], *s, *t, *s1;
slist_t *sl, *sl0;
unsigned u;
FILE *w;
+ if(config.debug >= 2) {
+ log_debug("= config file [flags 0x%02x] =\n", flags);
+ for(f = f0; f; f = f->next) {
+ log_info(" key %d \"%s\", value %d \"%s\", raw \"%s\"\n", f->key,
f->key_str, f->nvalue, f->value, f->unparsed ?: "");
+ }
+ }
+
/*
* Maybe it's an AutoYaST XML file.
*
- * If so, try limiting the scope to lines in first '<info_file>' element.
+ * If so, limit the scope to lines in first '<info_file>' element.
*/
for(f = f0; f; f = f->next) {
if(f->key == key_none) {
- if(!strncmp(f->key_str, "<info_file", sizeof "<info_file" - 1)) {
+ if(
+ !strncmp(f->key_str, "<info_file", sizeof "<info_file" - 1) &&
+ !strstr(f->key_str, "</info_file>") &&
+ !strstr(f->key_str, "/>")
+ ) {
is_xml = 1;
- f0 = f->next;
+ xml_section_start = f->next;
break;
}
- if(!strcmp(f->key_str, "</profile>")) {
+ if(
+ !strncmp(f->key_str, "<?xml", sizeof "<?xml" - 1) ||
+ !strncmp(f->key_str, "<profile", sizeof "<profile" - 1) ||
+ !strcmp(f->key_str, "</profile>")
+ ) {
is_xml = 1;
}
}
}
+ if(is_xml) f0 = xml_section_start;
+
+ if(config.debug >= 2 && is_xml) {
+ log_debug(" = xml file, applying only these lines =\n", flags);
+ }
+
for(f = f0; f; f = f->next) {
if(
is_xml &&
@@ -640,6 +661,10 @@
break;
}
+ if(config.debug >= 2 && is_xml) {
+ log_debug(" key %d \"%s\", value %d \"%s\", raw \"%s\"\n", f->key,
f->key_str, f->nvalue, f->value, f->unparsed ?: "");
+ }
+
switch(f->key) {
case key_insmod:
case key_insmod_pre:
