summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-10-26 18:27:18 -0400
committerMichael DeHaan <mdehaan@redhat.com>2007-10-26 18:27:18 -0400
commit5c42048c77796ea112976eb0b77f6d53a617d488 (patch)
tree0f9cf8591fa788ae9b6e0fb328f909fec20a87ff /func
parenta468a41a3e9034432bf866f75591ba77d0f59f04 (diff)
downloadthird_party-func-5c42048c77796ea112976eb0b77f6d53a617d488.tar.gz
third_party-func-5c42048c77796ea112976eb0b77f6d53a617d488.tar.xz
third_party-func-5c42048c77796ea112976eb0b77f6d53a617d488.zip
Fix something I accidentally committed to the virt module that doesn't need to be there.
Diffstat (limited to 'func')
-rwxr-xr-xfunc/minion/modules/virt.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/func/minion/modules/virt.py b/func/minion/modules/virt.py
index 3e7fc2d..b92dd54 100755
--- a/func/minion/modules/virt.py
+++ b/func/minion/modules/virt.py
@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# other modules
import os
import sub_process
-# import libvirt
+import libvirt
# our modules
import codes
@@ -42,14 +42,6 @@ class FuncLibvirtConnection(object):
def __init__(self):
- self.loaded = False
-
- try:
- import libvirt
- self.loaded = True
- except:
- return
-
cmd = sub_process.Popen("uname -r", shell=True, stdout=sub_process.PIPE)
output = cmd.communicate()[0]
@@ -154,8 +146,6 @@ class Virt(func_module.FuncModule):
def get_conn(self):
self.conn = FuncLibvirtConnection()
- if not self.conn.loaded:
- return False
return self.conn
def info(self):