From dbcd1a4964a6b23bbf2566fac76175179cb662d5 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 1 Aug 2018 09:29:12 +0200 Subject: fdisk: fix error message on 'd' command Command (m for help): d No partition is defined yet! Could not delete partition 93840461057817 <--- ! Don't print 'Could not delete..' if no partition is defined yet. Addresses: https://github.com/karelzak/util-linux/issues/667 Signed-off-by: Karel Zak --- disk-utils/fdisk-menu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'disk-utils') diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index b2cb0d7cb..a6f43515f 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -650,8 +650,10 @@ static int generic_menu_cb(struct fdisk_context **cxt0, switch (ent->key) { case 'd': rc = fdisk_ask_partnum(cxt, &n, FALSE); - if (!rc) - rc = fdisk_delete_partition(cxt, n); + if (rc) + break; /* no partitions yet (or ENOMEM, ...) */ + + rc = fdisk_delete_partition(cxt, n); if (rc) fdisk_warnx(cxt, _("Could not delete partition %zu"), n + 1); else -- cgit v1.2.3-55-g7522