You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2012/02/28 00:22:27 UTC
svn commit: r1294410 - in /incubator/tashi/branches/stable: ./
src/tashi/nodemanager/vmcontrol/qemu.py
Author: stroucki
Date: Tue Feb 28 00:22:27 2012
New Revision: 1294410
URL: http://svn.apache.org/viewvc?rev=1294410&view=rev
Log:
merge readlink fix from trunk
Modified:
incubator/tashi/branches/stable/ (props changed)
incubator/tashi/branches/stable/src/tashi/nodemanager/vmcontrol/qemu.py
Propchange: incubator/tashi/branches/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 00:22:27 2012
@@ -4,4 +4,4 @@
/incubator/tashi/branches/stroucki-irpbugs:1245857-1292894
/incubator/tashi/branches/stroucki-slotsbug:1244839-1245041
/incubator/tashi/branches/zoni-dev/trunk:1034098-1177646
-/incubator/tashi/trunk:1203846-1241774,1245045,1292488,1292541,1292543,1292895,1293348,1293401,1294310
+/incubator/tashi/trunk:1203846-1241774,1245045,1292488,1292541,1292543,1292895,1293348,1293401,1294310,1294409
Modified: incubator/tashi/branches/stable/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stable/src/tashi/nodemanager/vmcontrol/qemu.py?rev=1294410&r1=1294409&r2=1294410&view=diff
==============================================================================
--- incubator/tashi/branches/stable/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/branches/stable/src/tashi/nodemanager/vmcontrol/qemu.py Tue Feb 28 00:22:27 2012
@@ -132,7 +132,10 @@ class Qemu(VmControlInterface):
def __getHostPids(self):
"""Utility function to get a list of system PIDs that match the QEMU_BIN specified (/proc/nnn/exe)"""
pids = []
- real_bin = os.readlink(self.QEMU_BIN)
+ real_bin = self.QEMU_BIN
+ while os.path.islink(real_bin):
+ real_bin = os.readlink(self.QEMU_BIN)
+
for f in os.listdir("/proc"):
try:
bin = os.readlink("/proc/%s/exe" % (f))