summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2015-12-03 15:26:44 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2015-12-03 18:00:54 +0100
commit20483ead5bbc74b68126dfadec7b5f98f41b3400 (patch)
tree0c9f51e6d2986afb39b8297d31b32e67dee6a6c1
parentc15c44a4924e07d96cea04672fbcd45c7d8aa7ab (diff)
downloadlvm2-20483ead5bbc74b68126dfadec7b5f98f41b3400.tar.gz
cleanup: use try_id_read_format
Better then using log_suppress in this case.
-rw-r--r--tools/toollib.c7
-rw-r--r--tools/vgrename.c4
2 files changed, 3 insertions, 8 deletions
diff --git a/tools/toollib.c b/tools/toollib.c
index 3980a88a3..e03aaf77f 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2101,11 +2101,8 @@ static void _choose_vgs_to_process(struct cmd_context *cmd,
* matches the UUID of a VG. (--select should generally
* be used to select a VG by uuid instead.)
*/
- if (!found && (cmd->command->flags & ALLOW_UUID_AS_NAME)) {
- log_suppress(2);
- arg_is_uuid = id_read_format(&id, sl->str);
- log_suppress(0);
- }
+ if (!found && (cmd->command->flags & ALLOW_UUID_AS_NAME))
+ arg_is_uuid = id_read_format_try(&id, sl->str);
if (!found && arg_is_uuid) {
dm_list_iterate_items_safe(vgnl, vgnl2, vgnameids_on_system) {
diff --git a/tools/vgrename.c b/tools/vgrename.c
index 07d992ece..9e6beec35 100644
--- a/tools/vgrename.c
+++ b/tools/vgrename.c
@@ -107,9 +107,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
}
}
- log_suppress(2);
- found_id = id_read_format(&id, vg_name_old);
- log_suppress(0);
+ found_id = id_read_format_try(&id, vg_name_old);
if (found_id && (vg_name = lvmcache_vgname_from_vgid(cmd->mem, (char *)id.uuid))) {
if (!strcmp(vg_name, vg_name_new)) {