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 <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-08-01 09:29:12 +02:00
parent d5fd9ac6b2
commit dbcd1a4964
1 changed files with 4 additions and 2 deletions

View File

@ -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