[node-patches] Change in ovirt-node[master]: fix previous commit

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: fix previous commit
......................................................................

fix previous commit

Issue happen in lines 142-145 of previous commit:http://gerrit.ovirt.org/
Using "puppet plugins" as an example,
[root at localhost admin]# /bin/rpm -qf /etc/ovirt-plugins.d/ovirt-node-plugin-puppet --qf %{name}
file /etc/ovirt-plugins.d/ovirt-node-plugin-puppet is not owned by any package
Actually the name of the file "ovirt-node-plugin-puppet" is the package name,lines 142-145 weren't
necessary for us.

Change-Id: I1648b1e8d446476d47ac09daf86645d0687ac783
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=994825
Signed-off-by: hadong <hadong0720 at gmail.com>
---
M src/ovirt/node/setup/core/plugins_page.py
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/04/17804/1

diff --git a/src/ovirt/node/setup/core/plugins_page.py b/src/ovirt/node/setup/core/plugins_page.py
index f43cf84..dbe6716 100644
--- a/src/ovirt/node/setup/core/plugins_page.py
+++ b/src/ovirt/node/setup/core/plugins_page.py
@@ -139,14 +139,10 @@
                                 "Install Date:", "")
                         else:
                             try:
-                                cmd = '/bin/rpm -qf %s/%s --qf %%{name}' % \
-                                    (plugin_dir, f)
-                                package = process.check_output(cmd.split(' ')
-                                                               ).strip()
                                 cmd = "rpm -q %s --qf 'NAME: %s DATE: \
                                        %%{version}-%%{release}.%%{arch} INST: \
                                        %%{INSTALLTIME:date}\\n'" %\
-                                    (package, package)
+                                    (f, f)
                                 name, ver, install_date = re.match(
                                     r'NAME: (.*?) DATE: (.*?) INST: (.*)',
                                     process.check_output(cmd, shell=True


-- 
To view, visit http://gerrit.ovirt.org/17804
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1648b1e8d446476d47ac09daf86645d0687ac783
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>