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-06-28 15:33:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Mon Jun 28 15:33:28 2021 rev:300 rq:902671 version:8.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2021-06-15
16:37:25.157702037 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new.2625/linuxrc.changes
2021-06-28 15:33:42.083191357 +0200
@@ -1,0 +2,8 @@
+Fri Jun 25 13:30:12 UTC 2021 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#268
+- read rules.xml if autoyast option indicates a rules-based setup
+ (bsc#1187235)
+- 8.0.2
+
+--------------------------------------------------------------------
Old:
----
linuxrc-8.0.1.tar.xz
New:
----
linuxrc-8.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.n1bsML/_old 2021-06-28 15:33:42.563191943 +0200
+++ /var/tmp/diff_new_pack.n1bsML/_new 2021-06-28 15:33:42.563191943 +0200
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 8.0.1
+Version: 8.0.2
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-8.0.1.tar.xz -> linuxrc-8.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.0.1/VERSION new/linuxrc-8.0.2/VERSION
--- old/linuxrc-8.0.1/VERSION 2021-06-10 08:56:01.000000000 +0200
+++ new/linuxrc-8.0.2/VERSION 2021-06-25 15:30:12.000000000 +0200
@@ -1 +1 @@
-8.0.1
+8.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.0.1/auto2.c new/linuxrc-8.0.2/auto2.c
--- old/linuxrc-8.0.1/auto2.c 2021-06-10 08:56:01.000000000 +0200
+++ new/linuxrc-8.0.2/auto2.c 2021-06-25 15:30:12.000000000 +0200
@@ -1202,9 +1202,13 @@
/*
* Read autoyast file from url and parse it.
*
- * If the autoyast url points to a directory, nothing is read but the
- * function tries to mount the directory to ensure it exists. This is
- * basically done to search for the correct medium.
+ * If the autoyast url points to a directory, the function tries to mount
+ * the directory to ensure it exists. If it is a non-mountable url (e.g.
+ * http) it assumes a rules-based setup and that a file rules/rules.xml
+ * exists below the specified directory. The rules file is only read, not
+ * parsed.
+ *
+ * This is basically done to search for the correct medium.
*/
void auto2_read_autoyast(url_t *url)
{
@@ -1219,7 +1223,7 @@
*
* That works for mountable url schemes.
*
- * For the rest (http(s), (t)ftp) we'll just assume it works.
+ * For the rest (http(s), (t)ftp), try to read rules/rules.xml.
*/
if(url->is.dir) {
/*
@@ -1231,6 +1235,22 @@
url_mount(url, NULL, NULL);
url_umount(url);
}
+ else if(url->path) {
+ char *old_path = NULL;
+ str_copy(&old_path, url->path);
+
+ int path_len = strlen(url->path);
+ if(path_len && url->path[path_len - 1] == '/') url->path[path_len - 1] =
0;
+
+ strprintf(&url->path, "%s/rules/rules.xml", url->path);
+
+ log_show_maybe(!url->quiet, "Downloading AutoYaST rules file: %s\n",
url->str);
+
+ url_read_file_anywhere(url, NULL, NULL, "/download/rules.xml", NULL,
URL_FLAG_PROGRESS + URL_FLAG_NODIGEST);
+
+ str_copy(&url->path, old_path);
+ free(old_path);
+ }
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-8.0.1/changelog new/linuxrc-8.0.2/changelog
--- old/linuxrc-8.0.1/changelog 2021-06-10 08:56:01.000000000 +0200
+++ new/linuxrc-8.0.2/changelog 2021-06-25 15:30:12.000000000 +0200
@@ -1,3 +1,8 @@
+2021-06-25: 8.0.2
+ - merge gh#openSUSE/linuxrc#268
+ - read rules.xml if autoyast option indicates a rules-based setup
+ (bsc#1187235)
+
2021-06-10: 8.0.1
- merge gh#openSUSE/linuxrc#264
- prevent memory corruption while iterating through network device
