[Pkg-utopia-commits] r1299 - in packages/experimental/hal/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-21 18:40:10 +0000 (Wed, 21 Mar 2007)
New Revision: 1299

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/patches/13_hal_callout_bashism.patch
   packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch
Log:
Revise the two patches for 0.5.9~rc1. While at it, fix a small bug in 
HAL_INFO (("volume_id_probe_all returned %d")); call.


Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2007-03-21 18:38:22 UTC (rev 1298)
+++ packages/experimental/hal/debian/changelog	2007-03-21 18:40:10 UTC (rev 1299)
@@ -19,6 +19,8 @@
     - debian/patches/27_hal_fix_dbus_error_is_set.patch
   * Revised patches:
     - debian/patches/02_powerscripts.patch
+    - debian/patches/30_cdrom_bogus_tocinfo.patch
+    - debian/patches/13_hal_callout_bashism.patch
   * debian/patches/19_sonypi_support.patch
     - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
       is used directly.

Modified: packages/experimental/hal/debian/patches/13_hal_callout_bashism.patch
===================================================================
--- packages/experimental/hal/debian/patches/13_hal_callout_bashism.patch	2007-03-21 18:38:22 UTC (rev 1298)
+++ packages/experimental/hal/debian/patches/13_hal_callout_bashism.patch	2007-03-21 18:40:10 UTC (rev 1299)
@@ -60,16 +60,3 @@
      if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
  	RESULT=$(polkit-is-privileged --privilege $PRIVILEGE \
  	    --user $HAL_METHOD_INVOKED_BY_UID \
-diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
-index 59cde73..6842cc0 100755
---- a/tools/linux/hal-system-power-suspend-linux
-+++ b/tools/linux/hal-system-power-suspend-linux
-@@ -19,7 +19,7 @@ unsupported() {
- read seconds_to_sleep
- 
- #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
--if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then
-+if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then
- 	hal-system-power-pmu sleep
- 	if [ $? -ne 0 ]; then
- 		echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2

Modified: packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch
===================================================================
--- packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch	2007-03-21 18:38:22 UTC (rev 1298)
+++ packages/experimental/hal/debian/patches/30_cdrom_bogus_tocinfo.patch	2007-03-21 18:40:10 UTC (rev 1299)
@@ -1,32 +1,18 @@
-commit 43e26dadd6610b8782248d7af727a7525fd55be6
-Author: Sjoerd Simons <sjoerd at luon.net>
-Date:   Wed Mar 7 23:21:54 2007 +0100
-
-    work around cd drives giving wrong TOC info
-    
-    Some cd/dvd drives give out wrong information when requesting the session
-    offset of certain drives. This causes hal to probe for a filesystem at the
-    wrong offset. Work around that by retrying the filesystem probe at offset 0 for discs if it failed.
-
 diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
-index a87bd31..d0f7354 100644
+index 1a255a7..a84d0c6 100644
 --- a/hald/linux/probing/probe-volume.c
 +++ b/hald/linux/probing/probe-volume.c
-@@ -586,7 +586,16 @@ main (int argc, char *argv[])
- 		/* probe for file system */
- 		vid = volume_id_open_fd (fd);
- 		if (vid != NULL) {
--			if (volume_id_probe_all (vid, vol_probe_offset , vol_size) == 0) {
-+			int ret;
-+			
-+			ret = volume_id_probe_all (vid, vol_probe_offset , vol_size);
-+			if (ret != 0 && is_disc && vol_probe_offset != 0) {
-+		          /* Some cd-rom drives report the offset of the session in the cd's TOC wrong.
-+			   * Fallback to probing at offset 0, just to be sure */
-+			  ret = volume_id_probe_all (vid, 0 , vol_size);
+@@ -613,7 +613,12 @@ main (int argc, char *argv[])
+ 			int vid_ret;
+ 			HAL_INFO (("invoking volume_id_probe_all, offset=%d, size=%d", vol_probe_offset, vol_size));
+ 			vid_ret = volume_id_probe_all (vid, vol_probe_offset , vol_size);
+-			HAL_INFO (("volume_id_probe_all returned %d"));
++			if (vid_ret != 0 && is_disc && vol_probe_offset != 0) {
++				/* Some cd-rom drives report the offset of the session in the cd's TOC wrong.
++				* Fallback to probing at offset 0, just to be sure */
++				vid_ret = volume_id_probe_all (vid, 0 , vol_size);
 +			}
-+
-+			if (ret == 0) {
++			HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
+ 			if (vid_ret == 0) {
  				set_volume_id_values(ctx, udi, cs, vid);
- 			} else {
- 				libhal_changeset_set_property_string (cs, "info.product", "Volume");
+ 				if (disc_may_have_data) {