From 3a049035fbae1e1687cc414ca02a604a93f97638 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Thu, 27 Mar 2014 11:06:25 +0700 Subject: [PATCH] Give warning for missing pool and continue --- Puli/src/octopus/dispatcher/db/pulidb.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Puli/src/octopus/dispatcher/db/pulidb.py b/Puli/src/octopus/dispatcher/db/pulidb.py index 306f1954..455761af 100644 --- a/Puli/src/octopus/dispatcher/db/pulidb.py +++ b/Puli/src/octopus/dispatcher/db/pulidb.py @@ -798,11 +798,14 @@ def restoreStateFromDb(self, tree, rnsAlreadyLoaded): for num, dbPoolShare in enumerate(poolShares): id, poolId, nodeId, maxRN, archived = dbPoolShare #FIXME temp - if nodeId in nodesById.keys(): - realPoolShare = PoolShare(id, - poolsById[poolId], - nodesById[nodeId], - maxRN) + if not poolId in poolsById.keys(): + print "%s !!! Warning: PoolShare %d references nonexisting pool ID (%d)" % (time.strftime('[%H:%M:%S]', time.gmtime(time.time() - begintime)),id,poolId) + else: + if nodeId in nodesById.keys(): + realPoolShare = PoolShare(id, + poolsById[poolId], + nodesById[nodeId], + maxRN) tree.poolShares[realPoolShare.id] = realPoolShare print "%s -- poolshares complete --" % (time.strftime('[%H:%M:%S]', time.gmtime(time.time() - begintime)))