From 220fe24d39a59f5d8c0eb8660ba3115f7f9fb800 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 22 Jul 2013 10:54:20 -0400 Subject: [PATCH 1/2] use global to fail as its not in self Signed-off-by: Brian Coca --- system/setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/setup b/system/setup index 5b78aae02e8..e6fde009afa 100644 --- a/system/setup +++ b/system/setup @@ -636,7 +636,7 @@ class LinuxHardware(Hardware): if e.errno == errno.ENOENT: pass else: - self.fail_json(msg=e.strerror) + module.fail_json(msg=e.strerror) self.facts['mounts'].append( {'mount': fields[1], From ecf074865f1876684f143f922fe8641edd21e584 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 22 Jul 2013 13:57:35 -0400 Subject: [PATCH 2/2] Continue on mount errors, don't fail the setup module. --- system/setup | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/system/setup b/system/setup index e6fde009afa..c304a3c8482 100644 --- a/system/setup +++ b/system/setup @@ -633,10 +633,7 @@ class LinuxHardware(Hardware): size_total = statvfs_result.f_bsize * statvfs_result.f_blocks size_available = statvfs_result.f_bsize * (statvfs_result.f_bavail) except OSError, e: - if e.errno == errno.ENOENT: - pass - else: - module.fail_json(msg=e.strerror) + continue self.facts['mounts'].append( {'mount': fields[1],