[bitbake-devel] [PATCH] bitbake/fetch2/wget: Remove unneeded function indirection and reindent
Richard Purdie
richard.purdie at linuxfoundation.org
Fri May 4 17:26:40 UTC 2012
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 89bf57b..9d36115 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -53,35 +53,32 @@ class Wget(FetchMethod):
def download(self, uri, ud, d, checkonly = False):
"""Fetch urls"""
- def fetch_uri(uri, ud, d):
- if checkonly:
- fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True)
- elif os.path.exists(ud.localpath):
- # file exists, but we didnt complete it.. trying again..
- fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True)
- else:
- fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True)
+ if checkonly:
+ fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True)
+ elif os.path.exists(ud.localpath):
+ # file exists, but we didnt complete it.. trying again..
+ fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True)
+ else:
+ fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True)
- uri = uri.split(";")[0]
- uri_decoded = list(decodeurl(uri))
- uri_type = uri_decoded[0]
- uri_host = uri_decoded[1]
+ uri = uri.split(";")[0]
+ uri_decoded = list(decodeurl(uri))
+ uri_type = uri_decoded[0]
+ uri_host = uri_decoded[1]
- fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
- fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
- if not checkonly:
- logger.info("fetch " + uri)
- logger.debug(2, "executing " + fetchcmd)
- bb.fetch2.check_network_access(d, fetchcmd)
- runfetchcmd(fetchcmd, d, quiet=checkonly)
+ fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
+ fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
+ if not checkonly:
+ logger.info("fetch " + uri)
+ logger.debug(2, "executing " + fetchcmd)
+ bb.fetch2.check_network_access(d, fetchcmd)
+ runfetchcmd(fetchcmd, d, quiet=checkonly)
- # Sanity check since wget can pretend it succeed when it didn't
- # Also, this used to happen if sourceforge sent us to the mirror page
- if not os.path.exists(ud.localpath) and not checkonly:
- raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri)
-
- fetch_uri(uri, ud, localdata)
-
+ # Sanity check since wget can pretend it succeed when it didn't
+ # Also, this used to happen if sourceforge sent us to the mirror page
+ if not os.path.exists(ud.localpath) and not checkonly:
+ raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri)
+
return True
def checkstatus(self, uri, ud, d):
More information about the bitbake-devel
mailing list