summaryrefslogtreecommitdiffstats
path: root/modules/virt.py
diff options
context:
space:
mode:
authorSeth Vidal <skvidal@fedoraproject.org>2007-09-24 15:44:37 -0400
committerSeth Vidal <skvidal@fedoraproject.org>2007-09-24 15:44:37 -0400
commit0067f7ff6189fdd46f49e45ed2099511eb4de004 (patch)
treec0e64ccb936e314200ce0ec3d2e02acc06b7fce2 /modules/virt.py
parent122714e5589843c5f283ad935b20345576d24ca6 (diff)
parentbcbdab56d02a09ecda8a70acd6e5990073dd6b3e (diff)
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
* 'master' of ssh://git.fedoraproject.org/git/hosted/func: add a basic AuditLogger class Package the subprocess module so that we can use it on EL4. Basic plugin for checking SMART status on drives. Add basic module for checking smart status of drives. Remove header from ps output
Diffstat (limited to 'modules/virt.py')
-rwxr-xr-xmodules/virt.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/virt.py b/modules/virt.py
index d345d75..15be92c 100755
--- a/modules/virt.py
+++ b/modules/virt.py
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# other modules
import sys
import os
-import subprocess
+import sub_process
import libvirt
# our modules
@@ -44,7 +44,7 @@ class FuncLibvirtConnection():
def __init__(self):
- cmd = subprocess.Popen("uname -r", shell=True, stdout=subprocess.PIPE)
+ cmd = sub_process.Popen("uname -r", shell=True, stdout=sub_process.PIPE)
output = cmd.communicate()[0]
if output.find("xen") != -1:
@@ -188,7 +188,7 @@ class Virt(func_module.FuncModule):
"--server=%s" % server_name
]
- rc = subprocess.call(koan_args,shell=False)
+ rc = sub_process.call(koan_args,shell=False)
if rc == 0:
return 0
else: