From 111c4e2f358ed211d2a94be176ed44ad44435bd8 Mon Sep 17 00:00:00 2001 From: Guido Trotter <ultrotter@google.com> Date: Mon, 28 Jun 2010 13:48:29 +0100 Subject: [PATCH] Fix _UpgradeConfig docstring Signed-off-by: Guido Trotter <ultrotter@google.com> Reviewed-by: Michael Hanselmann <hansmi@google.com> --- lib/config.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/config.py b/lib/config.py index aa479c096..98cb0fd5d 100644 --- a/lib/config.py +++ b/lib/config.py @@ -1237,9 +1237,11 @@ class ConfigWriter: This is because some data elements need uniqueness across the whole configuration, etc. - @warning: this function will call L{_WriteConfig()}, so it needs - to either be called with the lock held or from a safe place - (the constructor) + @warning: this function will call L{_WriteConfig()}, but also + L{DropECReservations} so it needs to be called only from a + "safe" place (the constructor). If one wanted to call it with + the lock held, a DropECReservationUnlocked would need to be + created first, to avoid causing deadlock. """ modified = False -- GitLab