From: Thierry Parmentelat Date: Tue, 25 Jun 2013 18:00:03 +0000 (+0200) Subject: fixes X-Git-Tag: nodemanager-5.2-4~8 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=ba280c93fc9b9274e95f290abd625a46cea5f29d fixes --- diff --git a/sliver_lxc.py b/sliver_lxc.py index db6c6b8..efde66c 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -138,13 +138,14 @@ unset pathmunge enforced_line = "[ -f /etc/planetlab.profile ] && source /etc/planetlab.profile\n" for path in [ 'root/.profile', 'home/%s/.profile'%name ]: from_root=os.path.join(containerDir,path) + # if dir is not yet existing let's forget it for now + if not os.path.isdir(os.path.dirname(from_root)): continue found=False try: - contents=file(from_root).readlnes() + contents=file(from_root).readlines() for content in contents: if content==enforced_line: found=True - except: - pass + except IOError: pass if not found: with open(from_root,"a") as user_profile: user_profile.write(enforced_line)