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

[PATCH rhel6 master 3/3] If baseurl is none don't start network (#659781)



In getTreeinfo if the baseurl is None don't try to check for http/ftp
and start network.

Resolves: rhbz#659781
---
 yuminstall.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index c936553..24aef16 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -708,7 +708,7 @@ class AnacondaYum(YumSorter):
         Try to get .treeinfo file from baseurl, optionally using proxy_url
         Saves the file into /tmp/.treeinfo
         """
-        if baseurl.startswith("http") or baseurl.startswith("ftp"):
+        if baseurl and (baseurl.startswith("http") or baseurl.startswith("ftp")):
             if not network.hasActiveNetDev():
                 if not self.anaconda.intf.enableNetwork():
                     log.error("Error downloading %s/.treeinfo: network enablement failed" % (baseurl))
-- 
1.7.3.2


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