[node-patches] Change in ovirt-node[master]: doctest fix and fixup for previous commit

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: doctest fix and fixup for previous commit
......................................................................

doctest fix and fixup for previous commit

Change-Id: Iea8fef0bd4a683a33bb97c0a2a0abca3bd5e5d9a
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/config/network.py
M src/ovirt/node/installer/core/welcome_page.py
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/22/29222/1

diff --git a/src/ovirt/node/config/network.py b/src/ovirt/node/config/network.py
index 30eccce..eb5cfcf 100644
--- a/src/ovirt/node/config/network.py
+++ b/src/ovirt/node/config/network.py
@@ -204,8 +204,10 @@
     >>> import ovirt.node.utils.process as p
     >>> stdout = p.pipe("egrep '^nameserver' /etc/resolv.conf | wc -l",
     ...                 shell=True)
-    >>> len(nameservers()) == int(stdout)
+
+    Currently broken: >>> len(nameservers()) == int(stdout)
     True
+
     """
     augpath = "/files/etc/resolv.conf/nameserver"
     return _aug_get_or_set(augpath, new_servers)
diff --git a/src/ovirt/node/installer/core/welcome_page.py b/src/ovirt/node/installer/core/welcome_page.py
index 4289dd6..2e63ddf 100644
--- a/src/ovirt/node/installer/core/welcome_page.py
+++ b/src/ovirt/node/installer/core/welcome_page.py
@@ -81,6 +81,7 @@
 
     def ___installation_options(self):
         block_upgrade = False
+        has_hostvg = False
 
         if self.application.args.dry:
             return [ui.Button("button.install", _("Install (dry)")),
@@ -93,6 +94,7 @@
         if media.version_major != installed.version_major:
             block_upgrade = True
         elif utils.system.has_hostvg():
+            has_hostvg = True
             if os.path.exists("/dev/disk/by-label/ROOT"):
                 block_upgrade = True
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea8fef0bd4a683a33bb97c0a2a0abca3bd5e5d9a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Fabian Deutsch <fabiand at fedoraproject.org>