* [PATCH 1/1] bitbake wget fetcher: add parameter: downloadfilename
2012-07-18 18:14 [PATCH 0/1] add downloadfilename parameter to bitbake wget fetcher nitin.a.kamble
@ 2012-07-18 18:14 ` nitin.a.kamble
0 siblings, 0 replies; 2+ messages in thread
From: nitin.a.kamble @ 2012-07-18 18:14 UTC (permalink / raw)
To: Openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
this allows wget fetcher to store the downloaded file in a specified custom filename in ${DL_DIR}
Exmaple:
SRC_URI = "https://edc.intel.com/Download.aspx?id=6190;downloadfilename=LIN_IEMGD_1_14_GOLD_2443.tgz"
This fixes bug:
[YOCTO #2570]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
bitbake/lib/bb/fetch2/__init__.py | 4 ++++
bitbake/lib/bb/fetch2/wget.py | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index fa963be..4cb1546 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -762,6 +762,10 @@ class FetchData(object):
if hasattr(self.method, "urldata_init"):
self.method.urldata_init(self, d)
+ if "downloadfilename" in self.parm:
+ # if user sets downloadfilename, use it instead.
+ self.basename = self.parm["downloadfilename"]
+
if "localpath" in self.parm:
# if user sets localpath for file, use it instead.
self.localpath = self.parm["localpath"]
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index b784afb..9affa0d 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -50,7 +50,11 @@ class Wget(FetchMethod):
def urldata_init(self, ud, d):
- ud.basename = os.path.basename(ud.path)
+ if 'downloadfilename' in ud.parm:
+ ud.basename = ud.parm['downloadfilename']
+ else:
+ ud.basename = os.path.basename(ud.path)
+
ud.localfile = data.expand(urllib.unquote(ud.basename), d)
def download(self, uri, ud, d, checkonly = False):
@@ -58,6 +62,9 @@ class Wget(FetchMethod):
basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate"
+ if 'downloadfilename' in ud.parm:
+ basecmd += " -O ${DL_DIR}/" + ud.localfile
+
if checkonly:
fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'")
elif os.path.exists(ud.localpath):
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread