valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11015 from mgwilliams/seed

Browse Source 
salt.modules.seed: Don't die due to bad symlinks
This commit is contained in:
Thomas S Hatch 2014-03-06 17:25:00 -08:00
commit 8c93e21dec
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/seed.py
View File

@ -235,9 +235,12 @@ def _chroot_exec(root, cmd):
def _chroot_pids(chroot):
pids = []
for root in glob.glob('/proc/[0-9]*/root'):
link = os.path.realpath(root)
if link.startswith(chroot):
pids.append(int(os.path.basename(
os.path.dirname(root)
)))
try:
link = os.path.realpath(root)
if link.startswith(chroot):
pids.append(int(os.path.basename(
os.path.dirname(root)
)))
except OSError:
pass
return pids