[oe-commits] Christopher Larson : bitbake.conf: only pass --no-check-certificate if wget supports it.

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: b76aa82dcec211105a3850283f0392f1f3340bfa
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b76aa82dcec211105a3850283f0392f1f3340bfa

Author: Christopher Larson <clarson at mvista.com>
Date:   Wed Aug 19 17:24:40 2009 +0000

bitbake.conf: only pass --no-check-certificate if wget supports it.

Signed-off-by: Chris Larson <clarson at mvista.com>

---

 conf/bitbake.conf |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 3a68959..fa5d112 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -561,12 +561,13 @@ FETCHCMD_wget = "/usr/bin/env wget -t 5 --no-check-certificate"
 FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"
 
+__wget_nocheckcert := "${@['--no-check-certificate', '']['unrecognized option' in os.popen3("wget --no-check-certificate")[2].read()]}"
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp ${__wget_nocheckcert} -P ${DL_DIR} ${URI}"
 FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp ${__wget_nocheckcert} -P ${DL_DIR} ${URI}"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"