[node-patches] Change in ovirt-node[master]: Don't merge the confirmation page model

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Don't merge the confirmation page model
......................................................................

Don't merge the confirmation page model

The confirmation page already merges models, but sets nothing.
Don't pull it into the progress page

Change-Id: I9ec01b5ab3bd7705c7129092039601ec591ac56d
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/installer/core/progress_page.py
A src/test.sh
2 files changed, 15 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/16/29516/1

diff --git a/src/ovirt/node/installer/core/progress_page.py b/src/ovirt/node/installer/core/progress_page.py
index 1a996c1..f9b658e 100644
--- a/src/ovirt/node/installer/core/progress_page.py
+++ b/src/ovirt/node/installer/core/progress_page.py
@@ -188,13 +188,14 @@
         app = self.progress_plugin.application
         config = {}
         for pname, plugin in app.plugins().items():
-            self.logger.debug("Config for page %s" % (pname))
-            try:
-                model = plugin.model()
-                config.update(model)
-                self.logger.debug("Merged config: %s" % (model))
-            except NotImplementedError:
-                self.logger.debug("Merged no config.")
+            if not "Confirm disk selections" in pname:
+                self.logger.debug("Config for page %s" % (pname))
+                try:
+                    model = plugin.model()
+                    config.update(model)
+                    self.logger.debug("Merged config: %s" % (model))
+                except NotImplementedError:
+                    self.logger.debug("Merged no config.")
         self.logger.debug("Final config: %s" % config)
         return config
 
diff --git a/src/test.sh b/src/test.sh
new file mode 100644
index 0000000..b17e42e
--- /dev/null
+++ b/src/test.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+
+src_rpms=($(find . -name "autotest.py1"))
+[[ -z "$src_rpms" ]] && {
+    echo "No"
+    exit 1
+}


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ec01b5ab3bd7705c7129092039601ec591ac56d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>