[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f15-alpha, etc.] Don't always attempt to load updates on kickstart installs (#677131).



pykickstart ensures that if "updates" is given, url is set to "floppy".
Otherwise, you've either provided a URL or skipped the command entirely.
In the last case, url is "".
---
 loader/kickstart.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/loader/kickstart.c b/loader/kickstart.c
index 69bb8f1..6df3040 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -497,10 +497,12 @@ static void setVnc(struct loaderData_s * loaderData, PyObject *handler) {
 static void setUpdates(struct loaderData_s * loaderData, PyObject *handler) {
     PyObject *url = getattr(handler, "updates", "url");
 
-    if (!isNotEmpty(url) || objIsStr(url, "floppy"))
-        flags |= LOADER_FLAGS_UPDATES;
-    else if (isNotEmpty(url))
-        loaderData->updatessrc = strdup(PyString_AsString(url));
+    if (isNotEmpty(url)) {
+        if (objIsStr(url, "floppy"))
+            flags |= LOADER_FLAGS_UPDATES;
+        else
+            loaderData->updatessrc = strdup(PyString_AsString(url));
+    }
 
     Py_XDECREF(url);
 }
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]