afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

better handling for deleting node directories

Browse source
This commit is contained in:
Blake J. Harnden 2018-04-26 15:52:34 -07:00
parent 4a2810e9b2
commit 164f02e5ac
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/netns/vnode.py
View file

@ -2,6 +2,7 @@
PyCoreNode and LxcNode classes that implement the network namespac virtual node. PyCoreNode and LxcNode classes that implement the network namespac virtual node.
""" """
import errno
import os import os
import random import random
import shutil import shutil
@ -145,10 +146,11 @@ class SimpleLxcNode(PyCoreNode):
# remove node directory if present # remove node directory if present
try: try:
if os.path.exists(self.ctrlchnlname): os.unlink(self.ctrlchnlname)
os.unlink(self.ctrlchnlname) except OSError as e:
except OSError: # no such file or directory
logger.exception("error removing node directory") if e.errno != errno.ENOENT:
logger.exception("error removing node directory")
# clear interface data, close client, and mark self and not up # clear interface data, close client, and mark self and not up
self._netif.clear() self._netif.clear()