Marcus Meissner
5b97712c80
- port fixes for various bugs from upstream (bsc#1136245) - add: libparted-dasd-correct-the-offset-where-the-first-pa.patch 4126d02, correct the offset where the first partition begins. This patch implements libparted-dasd-do-not-use-first-tracks.patch - remove: libparted-dasd-do-not-use-first-tracks.patch - add: parted-fix-crash-due-to-improper-partition-number-in.patch 149f009, fix crash due to improper partition number input, changed call to strtol, use base 0 to fit our parted-type.patch - modify: parted-type.patch (removed ui.c part) - add: parted-check-the-name-of-partition-first-when-to-nam.patch d7a2ff1, check the name of partition first when to name a partition - add: libparted-dasd-add-test-cases-for-the-new-fdasd-func.patch c11f5c0, 571e078, add test cases for the new fdasd functions - add: libparted-dasd-add-an-exception-for-changing-DASD-LD.patch ee2c0c2, add an exception for changing DASD-LDL partition table - add: libpartd-dasd-improve-flag-processing-for-DASD-LDL.patch 1545d6d, improve flag processing for DASD-LDL - add: clean-the-disk-information-when-commands-fail-in-int.patch 5a61f15, clean the disk information when commands fail in interactive mode - add: parted-ui-remove-unneccesary-information-of-command.patch 0b7946a, remove unneccesary information of command line - add: parted-fix-wrong-error-label-jump-in-mkpart.patch af150f6, fix wrong error label jump in mkpart - refresh: libparted-dasd-unify-vtoc-handling-for-cdl-ldl.patch 4f25d54, unify vtoc handling for cdl/ldl - refresh: libparted-dasd-update-and-improve-fdasd-functions.patch db37c8c, update and improve fdasd functions - refresh: libparted-dasd-add-new-fdasd-functions.patch b9e1281, add new fdasd functions OBS-URL: https://build.opensuse.org/request/show/712877 OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=142
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 0b7946a095f307e427b81795cbc96028ee179b91 Mon Sep 17 00:00:00 2001
|
|
From: Wang Dong <dongdwdw@linux.vnet.ibm.com>
|
|
Date: Fri, 24 Mar 2017 03:11:10 +0100
|
|
Subject: [PATCH] parted/ui: remove unneccesary information of command line
|
|
|
|
When some command fails, the information still exists in
|
|
command_line buffer. When in command mode or interactive mode,
|
|
if an interactive exception prompts, the remained information
|
|
will be processed as option from user. This will raise some other
|
|
information or even unexpected results. So before getting option
|
|
input from user, clean the command line buffer.
|
|
|
|
Example: When the disk label is invalid and user tries to make
|
|
new partition on the device with command like,
|
|
mkpart 0 50%. Then parted will raise an exception
|
|
telling an invalid disk label found and whether to correct it.
|
|
But at this time 0 as the input of mkpart will be
|
|
considered as the option input for the exception(yes/no).
|
|
So one more exception will raised with error information.
|
|
|
|
Signed-off-by: Wang Dong <dongdwdw@linux.vnet.ibm.com>
|
|
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
|
|
---
|
|
parted/ui.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/parted/ui.c b/parted/ui.c
|
|
index af0539c..752860b 100644
|
|
--- a/parted/ui.c
|
|
+++ b/parted/ui.c
|
|
@@ -1288,6 +1288,7 @@ command_line_get_ex_opt (const char* prompt, PedExceptionOption options)
|
|
PedExceptionOption opt;
|
|
char* opt_name;
|
|
|
|
+ command_line_flush ();
|
|
for (opt = option_get_next (options, 0); opt;
|
|
opt = option_get_next (options, opt)) {
|
|
options_strlist = str_list_append_unique (options_strlist,
|
|
--
|
|
2.16.4
|
|
|