Fixed logic issue in cache regen check. Submitted upstream.

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 3de9423a759ae04662e266b884a3b9bf525c4304..dfe7aebc9f117bc30a6f503a8a8be98fc3c8a01e 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.154 2007/04/10 05:32:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.155 2007/04/10 15:05:39 cardoe Exp $
+
+  10 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/0.5.9/04_cache_regen_return_fix.patch, files/0.5.9/series:
+  Fixed logic issue in cache regen check. Submitted upstream.
 
   10 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
   Fix up access violations with the sed

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index a1e24e5d46fc8c5ba3795baa714b4949c3c2daa4..66c693a78dc3dd767cfe2513f9aab678ece1b8d1 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -25,6 +25,10 @@ AUX 0.5.9/03_crasher_fix_fail_to_return_value.patch 759 RMD160 02095de1648ed5812
 MD5 801a95446b348b13ba7d34c96c0c4c74 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
 RMD160 02095de1648ed581202f9d5e3f697b007ebb7154 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
 SHA256 f6b8821c89bf2063a0cabc6d67a051e476960e17d510f9e688132b727a5e6e92 files/0.5.9/03_crasher_fix_fail_to_return_value.patch 759
+AUX 0.5.9/04_cache_regen_return_fix.patch 662 RMD160 be35a41d815e13416301a962886d609e8c11d977 SHA1 7a70940ca51ed1963a460957eef57cc93ccf9534 SHA256 0f1996db420adde84a67c07c5cc5b7076dda6d9ca005b524dd498856585b067d
+MD5 922d80e89f199a725c772297c7a3ffe3 files/0.5.9/04_cache_regen_return_fix.patch 662
+RMD160 be35a41d815e13416301a962886d609e8c11d977 files/0.5.9/04_cache_regen_return_fix.patch 662
+SHA256 0f1996db420adde84a67c07c5cc5b7076dda6d9ca005b524dd498856585b067d files/0.5.9/04_cache_regen_return_fix.patch 662
 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893
 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159
 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159
@@ -33,10 +37,10 @@ AUX 0.5.9/96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae
 MD5 38976c1da85ba17ba6a46f56cd1de3bf files/0.5.9/96_plugdev_allow_send.patch 1781
 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 files/0.5.9/96_plugdev_allow_send.patch 1781
 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a files/0.5.9/96_plugdev_allow_send.patch 1781
-AUX 0.5.9/series 158 RMD160 13b0cd67604a2fd267f0350d070ddefc2c20e406 SHA1 5ee784707f3d8a572eeca8cbd988a889a90c46cd SHA256 dabcaf6dc091142315b18eccd1847682209f6657de4be454ad8d57facd611d88
-MD5 e2cf4f0d0a66cc00e97cfa3aa1953ac2 files/0.5.9/series 158
-RMD160 13b0cd67604a2fd267f0350d070ddefc2c20e406 files/0.5.9/series 158
-SHA256 dabcaf6dc091142315b18eccd1847682209f6657de4be454ad8d57facd611d88 files/0.5.9/series 158
+AUX 0.5.9/series 190 RMD160 1f139fdafcfd32898b17f62503e5090cad6a6421 SHA1 70e5a9a264b54254f7129c3bcb89a34173110bd7 SHA256 ffc29c0cda42d8205501f3ab7d9d295694c5a02e993211a3363a3deca20d2493
+MD5 afe5be2721290b8f1b0c16cf7219f037 files/0.5.9/series 190
+RMD160 1f139fdafcfd32898b17f62503e5090cad6a6421 files/0.5.9/series 190
+SHA256 ffc29c0cda42d8205501f3ab7d9d295694c5a02e993211a3363a3deca20d2493 files/0.5.9/series 190
 AUX fix-scsi-fake-host-event.patch 3108 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea SHA1 af1d5c9a2cde091bd7abe04ed5e91a4bb815b675 SHA256 199749c188e5fb4858e4c1dac8800525377daf6a680dcd13e7096e71266ed05d
 MD5 3b6df9a24978d931781dc029c85288a9 files/fix-scsi-fake-host-event.patch 3108
 RMD160 2bda406fcb2dd92c348781a6c0958d40c79d78ea files/fix-scsi-fake-host-event.patch 3108
@@ -155,10 +159,10 @@ EBUILD hal-0.5.9.ebuild 6325 RMD160 6119b8fa872c3d0f7f9051bc38bdf7d5d9ddb8ea SHA
 MD5 8aa4bb23bb495810a4760280ce1d9de8 hal-0.5.9.ebuild 6325
 RMD160 6119b8fa872c3d0f7f9051bc38bdf7d5d9ddb8ea hal-0.5.9.ebuild 6325
 SHA256 af3d74f5098d48f66a4b3eea09e3bf33bba8720cd651b5773e2f87d0ef64509e hal-0.5.9.ebuild 6325
-MISC ChangeLog 24511 RMD160 c5710e88fd881a1e1aad1c1cb7f8f61740d1e9bb SHA1 3d5a926819166f3b597b0a190c101ef9d1f7003d SHA256 c493ea0a1462b4fec1e1e05af4ac424490faebddb9f11557a59957c6610a2a8e
-MD5 5a0e4ee2123d161661fdf821c83be7fd ChangeLog 24511
-RMD160 c5710e88fd881a1e1aad1c1cb7f8f61740d1e9bb ChangeLog 24511
-SHA256 c493ea0a1462b4fec1e1e05af4ac424490faebddb9f11557a59957c6610a2a8e ChangeLog 24511
+MISC ChangeLog 24692 RMD160 4c0c83f7ed447dfc2bf6b68387b2109edfd108a5 SHA1 6d4f34dbda4e789f9e8d65b32e77399652efb827 SHA256 227d6aa51b9ef0ad1a40986aafbec819acc2e5432b51db27478eb8c7e8e8834f
+MD5 fe81bdbbe777f75b08319af7dc9105bf ChangeLog 24692
+RMD160 4c0c83f7ed447dfc2bf6b68387b2109edfd108a5 ChangeLog 24692
+SHA256 227d6aa51b9ef0ad1a40986aafbec819acc2e5432b51db27478eb8c7e8e8834f ChangeLog 24692
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -175,7 +179,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGGyF/oeSe8B0zEfwRAp8LAKCCOPWvxv2uy/272kdamypyHk5gWgCfeu87
-2dIkgeIv04P+Gcg9Sa8XUg0=
-=VUKr
+iD8DBQFGG6e+oeSe8B0zEfwRAvXtAJ4xymLx31V/6NCkt3CEjfEqQjnHVwCeNNZa
+rzVD5FPH9a5Ks+2PRhzHYkM=
+=FWeb
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch b/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch
new file mode 100644 (file)
index 0000000..a31f84e
--- /dev/null
+++ b/sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch
@@ -0,0 +1,13 @@
+Index: b/hald/mmap_cache.c
+===================================================================
+--- a/hald/mmap_cache.c        2007-03-07 16:55:02.000000000 -0500
++++ b/hald/mmap_cache.c        2007-04-10 10:56:10.000000000 -0400
+@@ -137,7 +137,7 @@
+       HAL_INFO (("In regen_cache_cb exit_type=%d, return_code=%d", exit_type, return_code));
+ 
+       /* see create_cache.c - rc==0 means success - rc==2 means "success, but some fdi files skipped" */
+-      if (exit_type != HALD_RUN_SUCCESS || return_code != 0 || return_code != 2) {
++      if (exit_type != HALD_RUN_SUCCESS || ( return_code != 0 && return_code != 2)) {
+               regen_cache_success = FALSE;
+       } else {
+               regen_cache_success = TRUE;

diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series
index 7aa6aa0c19b9a361513c43a552389f0181d4dc6d..cb7fe35bb615d2f2443e5afb64c067c9e6b69bd2 100644 (file)
--- a/sys-apps/hal/files/0.5.9/series
+++ b/sys-apps/hal/files/0.5.9/series
@@ -1,5 +1,6 @@
 01_luks_mount_fix.patch
 02_acpi_repeated_property_change.patch
 03_crasher_fix_fail_to_return_value.patch
+04_cache_regen_return_fix.patch
 95_gentoo_man_page.patch
 96_plugdev_allow_send.patch