[node-patches] Change in ovirt-node[master]: Modified plugins_page to read correct delta-manifest-xxx.txt...

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: Modified plugins_page to read correct delta-manifest-xxx.txt files when clicking "RPM Diff","SRPM Diff" and "File Diff" buttons.
......................................................................

Modified plugins_page to read correct delta-manifest-xxx.txt
files when clicking "RPM Diff","SRPM Diff" and "File Diff" buttons.

Change-Id: I001f8c48da0d11339ddb1b26b3d6a2ed7fb77f1f
Signed-off-by: hadong <hadong0720 at gmail.com>
---
M src/ovirt/node/setup/core/plugins_page.py
1 file changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/77/16277/1

diff --git a/src/ovirt/node/setup/core/plugins_page.py b/src/ovirt/node/setup/core/plugins_page.py
index a5b132c..f60e043 100644
--- a/src/ovirt/node/setup/core/plugins_page.py
+++ b/src/ovirt/node/setup/core/plugins_page.py
@@ -96,17 +96,16 @@
 
     def on_merge(self, changes):
         p_manifests_dir = "/etc/ovirt-plugins-manifests.d"
-        p_name = self._model["plugin"]
         fn = None
         if "button.drpm" in changes:
-            fn = glob.glob("%s/delta-*-manifest-rpm-%s.txt" %
-                           (p_manifests_dir, p_name))[0]
+            fn = glob.glob("%s/delta-manifest-rpm.txt" %
+                           (p_manifests_dir))[0]
         elif "button.dsrpm" in changes:
-            fn = glob.glob("%s/delta-*-manifest-srpm-%s.txt" %
-                           (p_manifests_dir, p_name))[0]
+            fn = glob.glob("%s/delta-manifest-srpm.txt" %
+                           (p_manifests_dir))[0]
         elif "button.dfile" in changes:
-            fn = glob.glob("%s/delta-*-manifest-file-%s.txt" %
-                           (p_manifests_dir, p_name))[0]
+            fn = glob.glob("%s/delta-manifest-file.txt" %
+                           (p_manifests_dir))[0]
 
         if fn:
             self.logger.debug("Reading manifest from: %s" % fn)


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

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