[PATCH 3/6 master] Be more resilient to config files missing sections and options (#590591).

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

 



From: Chris Lumens <clumens@xxxxxxxxxx>

---
 pyanaconda/yuminstall.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py
index 8c68ea5..4821bd6 100644
--- a/pyanaconda/yuminstall.py
+++ b/pyanaconda/yuminstall.py
@@ -679,16 +679,17 @@ class AnacondaYum(YumSorter):
         variant = c.get("general", "variant")
 
         section = "variant-%s" % variant
-        if c.has_section(section):
+        if c.has_section(section) and c.has_option(section, "addons"):
             validAddons = c.get(section, "addons").split(",")
         else:
             return retval
 
         for addon in validAddons:
-            if not c.has_section("addon-%s" % addon):
+            addonSection = "addon-%s" % addon
+            if not c.has_section(addonSection) or not c.has_option(addonSection, "repository"):
                 continue
 
-            url = "%s/%s" % (baseurl, c.get("addon-%s" % addon, "repository"))
+            url = "%s/%s" % (baseurl, c.get(addonSection, "repository"))
             retval.append((addon, url))
 
         return retval
-- 
1.7.2.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux