From 6bb9fc6357377882076bfcb135a6d56c47f60bb2 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 9 Dec 2005 03:06:18 +0000 Subject: begin client hardening git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1617 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Toolset.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/lib/Client/Toolset.py') diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py index dd1c17be4..32deea99b 100644 --- a/src/lib/Client/Toolset.py +++ b/src/lib/Client/Toolset.py @@ -366,7 +366,10 @@ class Toolset(object): except OSError: return False except OSError: - mkdir(current) + try: + mkdir(current) + except OSError: + return False # If we get here, then the parent directory should exist try: @@ -386,8 +389,11 @@ class Toolset(object): system("cp %s /var/cache/bcfg2/%s" % (entry.get('name'))) rename(newfile.name, entry.get('name')) return True - except (OSError, IOError), errmsg: - print errmsg + except (OSError, IOError), err: + if err.errno == 13: + self.CondPrint('verbose', "Failed to open %s for writing" % (entry.get('name'))) + else: + print err return False def VerifyPackage(self, entry, modlist): -- cgit v1.2.3-1-g7c22