Mailinglist Archive: opensuse-commit (1206 mails)
| < Previous | Next > |
commit module-init-tools
- From: root@xxxxxxx (h_root)
- Date: Tue, 2 May 2006 15:08:47 +0200 (CEST)
- Message-id: <20060502130847.46B1B8C576@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package module-init-tools
checked in at Tue May 2 15:08:47 CEST 2006.
--------
--- module-init-tools/module-init-tools.changes 2006-04-28 12:26:47.000000000 +0200
+++ STABLE/module-init-tools/module-init-tools.changes 2006-05-02 13:42:59.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 2 13:37:30 CEST 2006 - mjancar@xxxxxxx
+
+- fix infinite loop when supported module requested by alias
+ depends on unsupported module (#170675)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ module-init-tools.spec ++++++
--- /var/tmp/diff_new_pack.PxCENE/_old 2006-05-02 15:05:41.000000000 +0200
+++ /var/tmp/diff_new_pack.PxCENE/_new 2006-05-02 15:05:41.000000000 +0200
@@ -13,7 +13,7 @@
Name: module-init-tools
BuildRequires: dietlibc dietzlib docbook-utils xmlcharent
Version: 3.2.2
-Release: 28
+Release: 30
%define ver 3.2.2
License: GPL
Group: System/Kernel
@@ -146,6 +146,9 @@
/etc/modprobe.d
%changelog -n module-init-tools
+* Tue May 02 2006 - mjancar@xxxxxxx
+- fix infinite loop when supported module requested by alias
+ depends on unsupported module (#170675)
* Fri Apr 28 2006 - agruen@xxxxxxx
- weak-modules: Fix pathname in --add-modules and --remove-modules
(170568).
++++++ module-init-tools-3.2.2-blacklist-warn.diff ++++++
--- /var/tmp/diff_new_pack.PxCENE/_old 2006-05-02 15:05:41.000000000 +0200
+++ /var/tmp/diff_new_pack.PxCENE/_new 2006-05-02 15:05:41.000000000 +0200
@@ -55,22 +55,18 @@
aliases = tmp_aliases;
if (aliases) {
-@@ -1839,10 +1848,12 @@
+@@ -1838,8 +1847,8 @@
+ opts, modoptions);
read_depends(dirname, aliases->module, &list);
- if ((skip_unsupp > 1)
-- && find_blacklist(aliases->module, &list, unsupported)) {
-+ && find_blacklist(aliases->module, &list,
-+ unsupported, "unsupported")) {
- continue;
- } else if (use_blacklist
-- && find_blacklist(aliases->module, &list, blacklist)) {
-+ && find_blacklist(aliases->module, &list,
-+ blacklist, "blacklisted")) {
- continue;
- } else {
+- if (!((skip_unsupp > 1) && find_blacklist(aliases->module, &list, unsupported))
+- && !(use_blacklist && find_blacklist(aliases->module, &list, blacklist))) {
++ if (!((skip_unsupp > 1) && find_blacklist(aliases->module, &list, unsupported, "unsupported"))
++ && !(use_blacklist && find_blacklist(aliases->module, &list, blacklist, "blacklisted"))) {
handle_module(aliases->module, &list, newname,
-@@ -1859,10 +1870,12 @@
+ remove, opts, first_time, err,
+ dry_run, verbose, modoptions,
+@@ -1854,10 +1863,12 @@
}
} else if (!orig_aliases) {
if ((skip_unsupp > 1)
++++++ module-init-tools-3.2.2-skip-unsupported.diff ++++++
--- /var/tmp/diff_new_pack.PxCENE/_old 2006-05-02 15:05:41.000000000 +0200
+++ /var/tmp/diff_new_pack.PxCENE/_new 2006-05-02 15:05:41.000000000 +0200
@@ -155,23 +155,18 @@
if (aliases) {
errfn_t err = error;
-@@ -1806,8 +1838,13 @@
+@@ -1806,8 +1838,8 @@
opts, modoptions);
read_depends(dirname, aliases->module, &list);
- if (!use_blacklist
- || !find_blacklist(modulearg, &list, blacklist))
-+ if ((skip_unsupp > 1)
-+ && find_blacklist(aliases->module, &list, unsupported)) {
-+ continue;
-+ } else if (use_blacklist
-+ && find_blacklist(aliases->module, &list, blacklist)) {
-+ continue;
-+ } else {
++ if (!((skip_unsupp > 1) && find_blacklist(aliases->module, &list, unsupported))
++ && !(use_blacklist && find_blacklist(aliases->module, &list, blacklist))) {
handle_module(aliases->module, &list, newname,
remove, opts, first_time, err,
dry_run, verbose, modoptions,
-@@ -1816,11 +1853,14 @@
+@@ -1816,11 +1848,14 @@
strip_modversion,
unknown_silent,
optstring);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |