hal: Branch 'master'

[Kay Sievers]

 hald/linux/probing/probe-volume.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5ea1c2aff509591fd753f5769552c84b910f870e
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sun May 24 18:18:10 2009 +0200

    probe-volume: remove needless check for empty fstype

diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
index 13c775a..02c7d53 100644
--- a/hald/linux/probing/probe-volume.c
+++ b/hald/linux/probing/probe-volume.c
@@ -97,8 +97,7 @@ set_blkid_values (LibHalChangeSet *cs, blkid_probe pr)
 
 	if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL))
 		type = "";
-	if (!libhal_changeset_set_property_string (cs, "volume.fstype", type))
-		libhal_changeset_set_property_string (cs, "volume.fstype", "");
+	libhal_changeset_set_property_string (cs, "volume.fstype", type);
 	HAL_DEBUG(("volume.fstype = '%s'", type));
 
 	if (blkid_probe_lookup_value(pr, "VERSION", &type_version, NULL))