[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 libparted/labels/dasd.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1b89f3de691b441e5e4e354b6232fc74d1ec5b0c
Author: Joel Granados Moreno <jgranado at redhat.com>
Date:   Thu Feb 19 16:53:12 2009 +0100

    dasd: emit a diagnostic upon probe failure
    
    * libparted/labels/dasd.c (dasd_probe): Inform the user when no dasd
    volumes are present in a device.

diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c
index 9edab40..b1cd937 100644
--- a/libparted/labels/dasd.c
+++ b/libparted/labels/dasd.c
@@ -1,7 +1,7 @@
 /* -*- Mode: c; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 
     libparted - a library for manipulating disk partitions
-    Copyright (C) 2000, 2001, 2007-2008 Free Software Foundation, Inc.
+    Copyright (C) 2000, 2001, 2007-2009 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -213,7 +213,6 @@ ped_disk_dasd_done ()
 static int
 dasd_probe (const PedDevice *dev)
 {
-	char *errstr = 0;
 	LinuxSpecific* arch_specific;
 	struct fdasd_anchor anchor;
 
@@ -238,9 +237,10 @@ dasd_probe (const PedDevice *dev)
 
 	return 1;
 
-error_cleanup:
+ error_cleanup:
 	fdasd_cleanup(&anchor);
-	ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL,errstr);
+	ped_exception_throw(PED_EXCEPTION_ERROR,PED_EXCEPTION_IGNORE_CANCEL,
+			    "Error while probing device %s.", dev->name);
 
 	return 0;
 }