From 25ae22e4610f78eabc76819a0b77a22abe79f113 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 12 Feb 2009 17:04:32 +0000
Subject: [PATCH] Do not check 'None' disk IDs for duplicates
In case of 'None' logical or physical IDs, we don't need to check them
for duplicates. This case can happen for DRBD devices in case of newly
added disks, for example.
Reviewed-by: imsnah
---
lib/config.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 46574df01..a4134f551 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -243,14 +243,16 @@ class ConfigWriter:
"""
result = []
- if disk.logical_id in l_ids:
- result.append("duplicate logical id %s" % str(disk.logical_id))
- else:
- l_ids.append(disk.logical_id)
- if disk.physical_id in p_ids:
- result.append("duplicate physical id %s" % str(disk.physical_id))
- else:
- p_ids.append(disk.physical_id)
+ if disk.logical_id is not None:
+ if disk.logical_id in l_ids:
+ result.append("duplicate logical id %s" % str(disk.logical_id))
+ else:
+ l_ids.append(disk.logical_id)
+ if disk.physical_id is not None:
+ if disk.physical_id in p_ids:
+ result.append("duplicate physical id %s" % str(disk.physical_id))
+ else:
+ p_ids.append(disk.physical_id)
if disk.children:
for child in disk.children:
--
GitLab