diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2007-04-10 15:05:39 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2007-04-10 15:05:39 +0000 |
| commit | 6144ae5fddf390373481c4ca100cd53b1fd07d22 (patch) | |
| tree | 6e6e5d83d64af4a72ed74b2713300ab7c924147d /sys-apps/hal/files | |
| parent | Stable on sparc wrt #173781 (diff) | |
| download | gentoo-2-6144ae5fddf390373481c4ca100cd53b1fd07d22.tar.gz gentoo-2-6144ae5fddf390373481c4ca100cd53b1fd07d22.tar.bz2 gentoo-2-6144ae5fddf390373481c4ca100cd53b1fd07d22.zip | |
Fixed logic issue in cache regen check. Submitted upstream.
(Portage version: 2.1.2.3)
Diffstat (limited to 'sys-apps/hal/files')
| -rw-r--r-- | sys-apps/hal/files/0.5.9/04_cache_regen_return_fix.patch | 13 | ||||
| -rw-r--r-- | sys-apps/hal/files/0.5.9/series | 1 |
2 files changed, 14 insertions, 0 deletions
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 index 000000000000..a31f84e80199 --- /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 7aa6aa0c19b9..cb7fe35bb615 100644 --- 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 |