[pkgsrc/trunk]: pkgsrc/sysutils/hal Another fix for hald from Sergio Lenzi. B...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c04ad1dff24
branches:  trunk
changeset: 645620:3c04ad1dff24
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 31 12:08:55 2015 +0000

description:
Another fix for hald from Sergio Lenzi. Bump PKGREVISION.

diffstat:

 sysutils/hal/Makefile                         |   4 ++--
 sysutils/hal/files/hald-netbsd/devinfo_mass.c |  16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r c2d3385976f1 -r 3c04ad1dff24 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Sat Jan 31 06:21:39 2015 +0000
+++ b/sysutils/hal/Makefile     Sat Jan 31 12:08:55 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2015/01/25 18:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2015/01/31 12:08:55 wiz Exp $
 
 DISTNAME=              hal-0.5.14
-PKGREVISION=           14
+PKGREVISION=           15
 CATEGORIES=            sysutils
 MASTER_SITES=          http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=          .tar.bz2
diff -r c2d3385976f1 -r 3c04ad1dff24 sysutils/hal/files/hald-netbsd/devinfo_mass.c
--- a/sysutils/hal/files/hald-netbsd/devinfo_mass.c     Sat Jan 31 06:21:39 2015 +0000
+++ b/sysutils/hal/files/hald-netbsd/devinfo_mass.c     Sat Jan 31 12:08:55 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: devinfo_mass.c,v 1.5 2015/01/25 18:46:09 wiz Exp $ */
+/* $NetBSD: devinfo_mass.c,v 1.6 2015/01/31 12:08:55 wiz Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -387,20 +387,22 @@
        vid = volume_id_open_fd (fd);
        if (vid) {
                if (volume_id_probe_all (vid, 0, psize) == 0) {
-                       char *type;
+                       const char *type,*fstype;
 
                        hal_device_property_set_string (d, "volume.label", vid->label);
                        hal_device_property_set_string (d, "volume.partition.label", vid->label);
                        hal_device_property_set_string (d, "volume.uuid", vid->uuid);
                        hal_device_property_set_string (d, "volume.partition.uuid", vid->uuid);
 
-                       if (volume_id_get_type (vid, &type) && type != NULL)
-                               if (strcmp (type, "vfat") == 0) {
-                                       HAL_INFO (("%s disklabel reports %s but libvolume_id says it is "
-                                           "%s, assuming disklabel is incorrect",
-                                           devpath, devinfo_mass_get_fstype (part->p_fstype), type));
+                       if ( type && volume_id_get_type (vid, &type)) {
+                               fstype=devinfo_mass_get_fstype (part->p_fstype);
+                               if (strcmp (type, fstype)) {
+                                       HAL_INFO (("%s disklabel reports [%s] but libvolume_id says it is "
+                                           "[%s], assuming disklabel is incorrect",
+                                           devpath, fstype, type));
                                        hal_device_property_set_string (d, "volume.fstype", type);
                                }
+                       }
                }
                volume_id_close (vid);
        }