Attachment 471221 Details for Bug 666435 – Patch Proposed

[patch] Patch Proposed

cobbler-proxy-environment-bz666435.patch (text/plain), 1.78 KB, created by Marcelo Moreira de Mello on 2010-12-30 22:12:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcelo Moreira de Mello

Created: 2010-12-30 22:12:27 UTC

Size: 1.78 KB

patch

obsolete

>--- ./cobbler/action_dlcontent.py.orig	2010-12-30 19:35:23.711437906 -0200
>+++ ./cobbler/action_dlcontent.py	2010-12-30 19:35:32.432365781 -0200
>@@ -60,13 +60,33 @@
>           ( "%s/menu.c32-3.61" % content_server, "%s/menu.c32" % dest),
>        )
> 
>-       self.logger.info("downloading content required to netboot all arches")
>-       for f in files:
>-          src = f[0]
>-          dst = f[1]
>-          if os.path.exists(dst) and not force:
>-             self.logger.info("path %s already exists, not overwriting existing content, use --force if you wish to update" % dst)
>-             continue
>+       proxies = {} 
>+       for var in os.environ.keys():
>+          if (var.lower() == "http_proxy"):
>+             proxies['http'] = os.environ[var]
>+
>+          if (var.lower() == "ftp_proxy"):
>+             proxies['ftp'] = os.environ[var]
>+
>+       if (len(proxies) > 0):
>+          for f in files:
>+             src = f[0]
>+             dst = f[1]
>+             if os.path.exists(dst) and not force:
>+                self.logger.info("path %s already exists, not overwriting existing content, use --force if you wish to update" % dst)
>+                continue
>+             os.chdir(dest)
>+             self.logger.info("downloading %s to %s" % (src,dst))
>+             urlgrabber.grabber.urlgrab(src, proxies=proxies)  
>+
>+       else:
>+          self.logger.info("downloading content required to netboot all arches")
>+          for f in files:
>+             src = f[0]
>+             dst = f[1]
>+             if os.path.exists(dst) and not force:
>+                self.logger.info("path %s already exists, not overwriting existing content, use --force if you wish to update" % dst)
>+                continue
>           self.logger.info("downloading %s to %s" % (src,dst))
>           urlgrabber.urlgrab(src,dst)
>

Actions: View | Diff

Attachments on bug 666435: 471221 | 473400