blkid: don't print devname if nothing detected

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 2f7860fd230bab5dece0e68566ecea714c8f43a5..11eee2e7fb5c7dc1bd00b1d197c2751297b6a32c 100644 (file)
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -513,13 +513,14 @@ static int lowprobe_device(blkid_probe pr, const char *devname,
        if (rc < 0)
                goto done;
 
-       nvals = blkid_probe_numof_values(pr);
+       if (!rc)
+               nvals = blkid_probe_numof_values(pr);
 
        if (nvals && !first && output & (OUTPUT_UDEV_LIST | OUTPUT_EXPORT_LIST))
                /* add extra line between output from devices */
                fputc('\n', stdout);
 
-       if (output & OUTPUT_DEVICE_ONLY) {
+       if (nvals && (output & OUTPUT_DEVICE_ONLY)) {
                printf("%s\n", devname);
                goto done;
        }