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

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



On Mon, Dec 06, 2010 at 08:43:01AM +0100, Ales Kozumplik wrote:
> 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.

You're right! I retract this part of my patch and defer to your
solution to just return None when no baseurl is passed.

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

Attachment: pgpzLeg3l7BVr.pgp
Description: PGP signature


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