[Pkg-utopia-commits] r1037 - packages/unstable/hal/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-27 19:32:28 +0000 (Wed, 27 Sep 2006)
New Revision: 1037

Modified:
   packages/unstable/hal/debian/patches/08_openfirmware.patch
Log:
Check if the openfirmware.model is set before trying to use it

Modified: packages/unstable/hal/debian/patches/08_openfirmware.patch
===================================================================
--- packages/unstable/hal/debian/patches/08_openfirmware.patch	2006-09-27 18:50:21 UTC (rev 1036)
+++ packages/unstable/hal/debian/patches/08_openfirmware.patch	2006-09-27 19:32:28 UTC (rev 1037)
@@ -8,7 +8,7 @@
 index 8aca683..a2a1998 100644
 --- a/hald/linux/osspec.c
 +++ b/hald/linux/osspec.c
-@@ -496,6 +496,68 @@ out:
+@@ -496,6 +496,70 @@ out:
  	hal_device_property_set_bool (d, "power_management.can_suspend_to_disk", can_hibernate);
  }
  
@@ -50,6 +50,8 @@
 +		};
 +	const gchar *model =
 +	  hal_device_property_get_string(root, "openfirmware.model");
++	if (model == NULL)
++		return; 
 +
 +	for (x = 0 ; model_formfactor[x].model ; x++) {
 +		if (strstr(model, model_formfactor[x].model)) {