[master 13/30] Fix a bad usage of execWithRedirect (#1197290)

KosiehBarter installerbot-noreply at redhat.com
Thu Jul 16 12:00:37 UTC 2015


From: David Shea <dshea at redhat.com>

execWithRedirect returns an int, not a tuple, and the argv used to
execute realm still had the command as argv[0], which is no longer
needed.

(cherry picked from commit 08a55ebeb6ce6fa9e66332bb9f34d0d69ea80ecc)
---
 pyanaconda/kickstart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 3656352..abd36af 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -562,11 +562,11 @@ def execute(self, *args):
             # no explicit password arg using implicit --no-password
             pw_args = ["--no-password"]
 
-        argv = ["realm", "join", "--install", iutil.getSysroot(), "--verbose"] + \
+        argv = ["join", "--install", iutil.getSysroot(), "--verbose"] + \
                pw_args + self.join_args
         rc = -1
         try:
-            rc = iutil.execWithRedirect("realm", argv)[0]
+            rc = iutil.execWithRedirect("realm", argv)
         except OSError:
             pass
 


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/a95aa96eb6567a40d3add58e4a480888f960986c


More information about the anaconda-patches mailing list