On 12/04/2010 02:48 AM, Brian C. Lane wrote:
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))
Brian,
Not sure if I get this.
I was thinking about doing what you did just there, but if you look
below in the function if baseurl is None and we fall through, it tries
to construct strings using baseurl. We get URLs like "None/.treeinfo"
and an error in the log file.
Ales
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
