From: Khem Raj Date: Wed, 2 Mar 2011 08:33:49 +0000 (+0000) Subject: fetch, fetch2: Get rid of DeprecationWarning notice X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36fe59ce314c295d239b76de34c8714def2c32d5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git fetch, fetch2: Get rid of DeprecationWarning notice * This patch fixes a cosmetic issue currently we get with master WARNING: /home/kraj/work/bitbake/lib/bb/fetch2/__init__.py:733: DeprecationWarning: Call to deprecated function bb.mkdirhier: Please use bb.utils.mkdirhier instead. bb.mkdirhier("%s/%s" % (rootdir, destdir)) Signed-off-by: Khem Raj Signed-off-by: Chris Larson --- diff --git a/bin/bitdoc b/bin/bitdoc index c2a7061d1b4..98fb025a50b 100755 --- a/bin/bitdoc +++ b/bin/bitdoc @@ -497,7 +497,7 @@ def main(): doc.insert_doc_item(doc_ins) # let us create the HTML now - bb.mkdirhier(output_dir) + bb.utils.mkdirhier(output_dir) os.chdir(output_dir) # Let us create the sites now. We do it in the following order diff --git a/lib/bb/fetch/bzr.py b/lib/bb/fetch/bzr.py index afaf799900c..9bde706df8c 100644 --- a/lib/bb/fetch/bzr.py +++ b/lib/bb/fetch/bzr.py @@ -94,7 +94,7 @@ class Bzr(Fetch): bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) bzrcmd = self._buildbzrcommand(ud, d, "fetch") logger.debug(1, "BZR Checkout %s", loc) - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", bzrcmd) runfetchcmd(bzrcmd, d) diff --git a/lib/bb/fetch/cvs.py b/lib/bb/fetch/cvs.py index 0edb794b044..64450afc294 100644 --- a/lib/bb/fetch/cvs.py +++ b/lib/bb/fetch/cvs.py @@ -137,7 +137,7 @@ class Cvs(Fetch): else: logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(pkgdir) + bb.utils.mkdirhier(pkgdir) os.chdir(pkgdir) logger.debug(1, "Running %s", cvscmd) myret = os.system(cvscmd) diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py index 7d5233911a3..981c494b497 100644 --- a/lib/bb/fetch/git.py +++ b/lib/bb/fetch/git.py @@ -131,7 +131,7 @@ class Git(Fetch): # If the checkout doesn't exist and the mirror tarball does, extract it if not os.path.exists(ud.clonedir) and os.path.exists(repofile): - bb.mkdirhier(ud.clonedir) + bb.utils.mkdirhier(ud.clonedir) os.chdir(ud.clonedir) runfetchcmd("tar -xzf %s" % (repofile), d) @@ -188,7 +188,7 @@ class Git(Fetch): os.chdir(coprefix) runfetchcmd("%s checkout -q -f %s%s" % (ud.basecmd, ud.tag, readpathspec), d) else: - bb.mkdirhier(codir) + bb.utils.mkdirhier(codir) os.chdir(ud.clonedir) runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.tag, readpathspec), d) runfetchcmd("%s checkout-index -q -f --prefix=%s -a" % (ud.basecmd, coprefix), d) diff --git a/lib/bb/fetch/hg.py b/lib/bb/fetch/hg.py index 3c649a6ad0c..2b3aec543b5 100644 --- a/lib/bb/fetch/hg.py +++ b/lib/bb/fetch/hg.py @@ -131,7 +131,7 @@ class Hg(Fetch): fetchcmd = self._buildhgcommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", fetchcmd) runfetchcmd(fetchcmd, d) diff --git a/lib/bb/fetch/osc.py b/lib/bb/fetch/osc.py index 8e0423d7627..32237b97409 100644 --- a/lib/bb/fetch/osc.py +++ b/lib/bb/fetch/osc.py @@ -98,7 +98,7 @@ class Osc(Fetch): oscfetchcmd = self._buildosccommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", oscfetchcmd) runfetchcmd(oscfetchcmd, d) diff --git a/lib/bb/fetch/perforce.py b/lib/bb/fetch/perforce.py index 222ed7eaaa8..e933d276034 100644 --- a/lib/bb/fetch/perforce.py +++ b/lib/bb/fetch/perforce.py @@ -154,7 +154,7 @@ class Perforce(Fetch): # create temp directory logger.debug(2, "Fetch: creating temporary directory") - bb.mkdirhier(data.expand('${WORKDIR}', localdata)) + bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata) tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") tmpfile = tmppipe.readline().strip() diff --git a/lib/bb/fetch/repo.py b/lib/bb/fetch/repo.py index 03642e7a0d2..512fffb4cee 100644 --- a/lib/bb/fetch/repo.py +++ b/lib/bb/fetch/repo.py @@ -71,7 +71,7 @@ class Repo(Fetch): else: username = "" - bb.mkdirhier(os.path.join(codir, "repo")) + bb.utils.mkdirhier(os.path.join(codir, "repo")) os.chdir(os.path.join(codir, "repo")) if not os.path.exists(os.path.join(codir, "repo", ".repo")): runfetchcmd("repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d) diff --git a/lib/bb/fetch/svk.py b/lib/bb/fetch/svk.py index 595a9da2551..dc818d2d67c 100644 --- a/lib/bb/fetch/svk.py +++ b/lib/bb/fetch/svk.py @@ -71,7 +71,7 @@ class Svk(Fetch): localdata = data.createCopy(d) data.update_data(localdata) logger.debug(2, "Fetch: creating temporary directory") - bb.mkdirhier(data.expand('${WORKDIR}', localdata)) + bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") tmpfile = tmppipe.readline().strip() diff --git a/lib/bb/fetch/svn.py b/lib/bb/fetch/svn.py index 8f053abf74b..6c2a1187d2c 100644 --- a/lib/bb/fetch/svn.py +++ b/lib/bb/fetch/svn.py @@ -146,7 +146,7 @@ class Svn(Fetch): svnfetchcmd = self._buildsvncommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", svnfetchcmd) runfetchcmd(svnfetchcmd, d) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 16c956059f8..d4f28e82352 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -730,7 +730,7 @@ class FetchMethod(object): destdir = urldata.path.rsplit("/", 1)[0] else: destdir = "." - bb.mkdirhier("%s/%s" % (rootdir, destdir)) + bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) cmd = 'cp %s %s/%s/' % (file, rootdir, destdir) if not cmd: @@ -741,7 +741,7 @@ class FetchMethod(object): os.chdir(rootdir) if 'subdir' in urldata.parm: newdir = ("%s/%s" % (rootdir, urldata.parm.get('subdir'))) - bb.mkdirhier(newdir) + bb.utils.mkdirhier(newdir) os.chdir(newdir) cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, True), cmd) diff --git a/lib/bb/fetch2/bzr.py b/lib/bb/fetch2/bzr.py index 454961eff01..201705b6cec 100644 --- a/lib/bb/fetch2/bzr.py +++ b/lib/bb/fetch2/bzr.py @@ -93,7 +93,7 @@ class Bzr(FetchMethod): bzrcmd = self._buildbzrcommand(ud, d, "fetch") bb.fetch2.check_network_access(d, bzrcmd, ud.url) logger.debug(1, "BZR Checkout %s", loc) - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", bzrcmd) runfetchcmd(bzrcmd, d) diff --git a/lib/bb/fetch2/cvs.py b/lib/bb/fetch2/cvs.py index 12d11e0d5ba..a111467bfcd 100644 --- a/lib/bb/fetch2/cvs.py +++ b/lib/bb/fetch2/cvs.py @@ -139,7 +139,7 @@ class Cvs(FetchMethod): else: logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(pkgdir) + bb.utils.mkdirhier(pkgdir) os.chdir(pkgdir) logger.debug(1, "Running %s", cvscmd) bb.fetch2.check_network_access(d, cvscmd, ud.url) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index f2c27e42a7f..1679f815113 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -116,7 +116,7 @@ class Git(FetchMethod): # If the checkout doesn't exist and the mirror tarball does, extract it if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror): - bb.mkdirhier(ud.clonedir) + bb.utils.mkdirhier(ud.clonedir) os.chdir(ud.clonedir) runfetchcmd("tar -xzf %s" % (ud.fullmirror), d) diff --git a/lib/bb/fetch2/hg.py b/lib/bb/fetch2/hg.py index 6a56f8d0cd8..35a4b3c30a9 100644 --- a/lib/bb/fetch2/hg.py +++ b/lib/bb/fetch2/hg.py @@ -131,7 +131,7 @@ class Hg(FetchMethod): fetchcmd = self._buildhgcommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", fetchcmd) bb.fetch2.check_network_access(d, fetchcmd, ud.url) diff --git a/lib/bb/fetch2/osc.py b/lib/bb/fetch2/osc.py index 4bf411c24f5..7c4c90c7153 100644 --- a/lib/bb/fetch2/osc.py +++ b/lib/bb/fetch2/osc.py @@ -96,7 +96,7 @@ class Osc(FetchMethod): oscfetchcmd = self._buildosccommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", oscfetchcmd) bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) diff --git a/lib/bb/fetch2/perforce.py b/lib/bb/fetch2/perforce.py index 6347834c769..cbdc84853cb 100644 --- a/lib/bb/fetch2/perforce.py +++ b/lib/bb/fetch2/perforce.py @@ -152,7 +152,7 @@ class Perforce(FetchMethod): # create temp directory logger.debug(2, "Fetch: creating temporary directory") - bb.mkdirhier(data.expand('${WORKDIR}', localdata)) + bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata) tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") tmpfile = tmppipe.readline().strip() diff --git a/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py index 54130a8c3b8..8300da8c5a4 100644 --- a/lib/bb/fetch2/repo.py +++ b/lib/bb/fetch2/repo.py @@ -69,7 +69,7 @@ class Repo(FetchMethod): else: username = "" - bb.mkdirhier(os.path.join(codir, "repo")) + bb.utils.mkdirhier(os.path.join(codir, "repo")) os.chdir(os.path.join(codir, "repo")) if not os.path.exists(os.path.join(codir, "repo", ".repo")): bb.fetch2.check_network_access(d, "repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), ud.url) diff --git a/lib/bb/fetch2/svk.py b/lib/bb/fetch2/svk.py index 6211cac8d35..9d34abf3daf 100644 --- a/lib/bb/fetch2/svk.py +++ b/lib/bb/fetch2/svk.py @@ -75,7 +75,7 @@ class Svk(FetchMethod): localdata = data.createCopy(d) data.update_data(localdata) logger.debug(2, "Fetch: creating temporary directory") - bb.mkdirhier(data.expand('${WORKDIR}', localdata)) + bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") tmpfile = tmppipe.readline().strip() diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index ac4fd27e14d..607bdd0cd4a 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -122,7 +122,7 @@ class Svn(FetchMethod): svnfetchcmd = self._buildsvncommand(ud, d, "fetch") logger.info("Fetch " + loc) # check out sources there - bb.mkdirhier(ud.pkgdir) + bb.utils.mkdirhier(ud.pkgdir) os.chdir(ud.pkgdir) logger.debug(1, "Running %s", svnfetchcmd) bb.fetch2.check_network_access(d, svnfetchcmd, ud.url)