Merge pull request #7887 from s0x/funtoo-gathering-facts

Check for empty os-release file, fixes #7885
This commit is contained in:
James Cammarata 2014-06-23 12:28:32 -05:00
commit ce41b02300

View file

@ -266,7 +266,7 @@ class Facts(object):
self.facts['distribution_release'] = dist[2] or 'NA'
# Try to handle the exceptions now ...
for (path, name) in Facts.OSDIST_DICT.items():
if os.path.exists(path):
if os.path.exists(path) and os.path.getsize(path) > 0:
if self.facts['distribution'] == 'Fedora':
pass
elif name == 'RedHat':