summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-02 08:33:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-03 22:51:33 +0000
commit54e10127c495bdb31cfef234cd2def0c4f8cf0b0 (patch)
tree422cda19c1e69a0c69c34fd843b0164591ca029f /bitbake/lib/bb/fetch
parentc07a153e7232d7070e97f5e661a8b2831b303806 (diff)
downloadpoky-54e10127c495bdb31cfef234cd2def0c4f8cf0b0.tar.gz
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)) (Bitbake rev: 36fe59ce314c295d239b76de34c8714def2c32d5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r--bitbake/lib/bb/fetch/bzr.py2
-rw-r--r--bitbake/lib/bb/fetch/cvs.py2
-rw-r--r--bitbake/lib/bb/fetch/git.py4
-rw-r--r--bitbake/lib/bb/fetch/hg.py2
-rw-r--r--bitbake/lib/bb/fetch/osc.py2
-rw-r--r--bitbake/lib/bb/fetch/perforce.py2
-rw-r--r--bitbake/lib/bb/fetch/repo.py2
-rw-r--r--bitbake/lib/bb/fetch/svk.py2
-rw-r--r--bitbake/lib/bb/fetch/svn.py2
9 files changed, 10 insertions, 10 deletions
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py
index afaf799900..9bde706df8 100644
--- a/bitbake/lib/bb/fetch/bzr.py
+++ b/bitbake/lib/bb/fetch/bzr.py
@@ -94,7 +94,7 @@ class Bzr(Fetch):
94 bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True) 94 bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
95 bzrcmd = self._buildbzrcommand(ud, d, "fetch") 95 bzrcmd = self._buildbzrcommand(ud, d, "fetch")
96 logger.debug(1, "BZR Checkout %s", loc) 96 logger.debug(1, "BZR Checkout %s", loc)
97 bb.mkdirhier(ud.pkgdir) 97 bb.utils.mkdirhier(ud.pkgdir)
98 os.chdir(ud.pkgdir) 98 os.chdir(ud.pkgdir)
99 logger.debug(1, "Running %s", bzrcmd) 99 logger.debug(1, "Running %s", bzrcmd)
100 runfetchcmd(bzrcmd, d) 100 runfetchcmd(bzrcmd, d)
diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py
index 0edb794b04..64450afc29 100644
--- a/bitbake/lib/bb/fetch/cvs.py
+++ b/bitbake/lib/bb/fetch/cvs.py
@@ -137,7 +137,7 @@ class Cvs(Fetch):
137 else: 137 else:
138 logger.info("Fetch " + loc) 138 logger.info("Fetch " + loc)
139 # check out sources there 139 # check out sources there
140 bb.mkdirhier(pkgdir) 140 bb.utils.mkdirhier(pkgdir)
141 os.chdir(pkgdir) 141 os.chdir(pkgdir)
142 logger.debug(1, "Running %s", cvscmd) 142 logger.debug(1, "Running %s", cvscmd)
143 myret = os.system(cvscmd) 143 myret = os.system(cvscmd)
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index b37a09743e..6b565e3eb5 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -131,7 +131,7 @@ class Git(Fetch):
131 131
132 # If the checkout doesn't exist and the mirror tarball does, extract it 132 # If the checkout doesn't exist and the mirror tarball does, extract it
133 if not os.path.exists(ud.clonedir) and os.path.exists(repofile): 133 if not os.path.exists(ud.clonedir) and os.path.exists(repofile):
134 bb.mkdirhier(ud.clonedir) 134 bb.utils.mkdirhier(ud.clonedir)
135 os.chdir(ud.clonedir) 135 os.chdir(ud.clonedir)
136 runfetchcmd("tar -xzf %s" % (repofile), d) 136 runfetchcmd("tar -xzf %s" % (repofile), d)
137 137
@@ -188,7 +188,7 @@ class Git(Fetch):
188 os.chdir(coprefix) 188 os.chdir(coprefix)
189 runfetchcmd("%s checkout -q -f %s%s" % (ud.basecmd, ud.tag, readpathspec), d) 189 runfetchcmd("%s checkout -q -f %s%s" % (ud.basecmd, ud.tag, readpathspec), d)
190 else: 190 else:
191 bb.mkdirhier(codir) 191 bb.utils.mkdirhier(codir)
192 os.chdir(ud.clonedir) 192 os.chdir(ud.clonedir)
193 runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.tag, readpathspec), d) 193 runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.tag, readpathspec), d)
194 runfetchcmd("%s checkout-index -q -f --prefix=%s -a" % (ud.basecmd, coprefix), d) 194 runfetchcmd("%s checkout-index -q -f --prefix=%s -a" % (ud.basecmd, coprefix), d)
diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py
index 3c649a6ad0..2b3aec543b 100644
--- a/bitbake/lib/bb/fetch/hg.py
+++ b/bitbake/lib/bb/fetch/hg.py
@@ -131,7 +131,7 @@ class Hg(Fetch):
131 fetchcmd = self._buildhgcommand(ud, d, "fetch") 131 fetchcmd = self._buildhgcommand(ud, d, "fetch")
132 logger.info("Fetch " + loc) 132 logger.info("Fetch " + loc)
133 # check out sources there 133 # check out sources there
134 bb.mkdirhier(ud.pkgdir) 134 bb.utils.mkdirhier(ud.pkgdir)
135 os.chdir(ud.pkgdir) 135 os.chdir(ud.pkgdir)
136 logger.debug(1, "Running %s", fetchcmd) 136 logger.debug(1, "Running %s", fetchcmd)
137 runfetchcmd(fetchcmd, d) 137 runfetchcmd(fetchcmd, d)
diff --git a/bitbake/lib/bb/fetch/osc.py b/bitbake/lib/bb/fetch/osc.py
index 8e0423d762..32237b9740 100644
--- a/bitbake/lib/bb/fetch/osc.py
+++ b/bitbake/lib/bb/fetch/osc.py
@@ -98,7 +98,7 @@ class Osc(Fetch):
98 oscfetchcmd = self._buildosccommand(ud, d, "fetch") 98 oscfetchcmd = self._buildosccommand(ud, d, "fetch")
99 logger.info("Fetch " + loc) 99 logger.info("Fetch " + loc)
100 # check out sources there 100 # check out sources there
101 bb.mkdirhier(ud.pkgdir) 101 bb.utils.mkdirhier(ud.pkgdir)
102 os.chdir(ud.pkgdir) 102 os.chdir(ud.pkgdir)
103 logger.debug(1, "Running %s", oscfetchcmd) 103 logger.debug(1, "Running %s", oscfetchcmd)
104 runfetchcmd(oscfetchcmd, d) 104 runfetchcmd(oscfetchcmd, d)
diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py
index 222ed7eaaa..e933d27603 100644
--- a/bitbake/lib/bb/fetch/perforce.py
+++ b/bitbake/lib/bb/fetch/perforce.py
@@ -154,7 +154,7 @@ class Perforce(Fetch):
154 154
155 # create temp directory 155 # create temp directory
156 logger.debug(2, "Fetch: creating temporary directory") 156 logger.debug(2, "Fetch: creating temporary directory")
157 bb.mkdirhier(data.expand('${WORKDIR}', localdata)) 157 bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata))
158 data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata) 158 data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata)
159 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") 159 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false")
160 tmpfile = tmppipe.readline().strip() 160 tmpfile = tmppipe.readline().strip()
diff --git a/bitbake/lib/bb/fetch/repo.py b/bitbake/lib/bb/fetch/repo.py
index 03642e7a0d..512fffb4ce 100644
--- a/bitbake/lib/bb/fetch/repo.py
+++ b/bitbake/lib/bb/fetch/repo.py
@@ -71,7 +71,7 @@ class Repo(Fetch):
71 else: 71 else:
72 username = "" 72 username = ""
73 73
74 bb.mkdirhier(os.path.join(codir, "repo")) 74 bb.utils.mkdirhier(os.path.join(codir, "repo"))
75 os.chdir(os.path.join(codir, "repo")) 75 os.chdir(os.path.join(codir, "repo"))
76 if not os.path.exists(os.path.join(codir, "repo", ".repo")): 76 if not os.path.exists(os.path.join(codir, "repo", ".repo")):
77 runfetchcmd("repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d) 77 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/bitbake/lib/bb/fetch/svk.py b/bitbake/lib/bb/fetch/svk.py
index 595a9da255..dc818d2d67 100644
--- a/bitbake/lib/bb/fetch/svk.py
+++ b/bitbake/lib/bb/fetch/svk.py
@@ -71,7 +71,7 @@ class Svk(Fetch):
71 localdata = data.createCopy(d) 71 localdata = data.createCopy(d)
72 data.update_data(localdata) 72 data.update_data(localdata)
73 logger.debug(2, "Fetch: creating temporary directory") 73 logger.debug(2, "Fetch: creating temporary directory")
74 bb.mkdirhier(data.expand('${WORKDIR}', localdata)) 74 bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata))
75 data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) 75 data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata)
76 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false") 76 tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, 1) or "false")
77 tmpfile = tmppipe.readline().strip() 77 tmpfile = tmppipe.readline().strip()
diff --git a/bitbake/lib/bb/fetch/svn.py b/bitbake/lib/bb/fetch/svn.py
index 8f053abf74..6c2a1187d2 100644
--- a/bitbake/lib/bb/fetch/svn.py
+++ b/bitbake/lib/bb/fetch/svn.py
@@ -146,7 +146,7 @@ class Svn(Fetch):
146 svnfetchcmd = self._buildsvncommand(ud, d, "fetch") 146 svnfetchcmd = self._buildsvncommand(ud, d, "fetch")
147 logger.info("Fetch " + loc) 147 logger.info("Fetch " + loc)
148 # check out sources there 148 # check out sources there
149 bb.mkdirhier(ud.pkgdir) 149 bb.utils.mkdirhier(ud.pkgdir)
150 os.chdir(ud.pkgdir) 150 os.chdir(ud.pkgdir)
151 logger.debug(1, "Running %s", svnfetchcmd) 151 logger.debug(1, "Running %s", svnfetchcmd)
152 runfetchcmd(svnfetchcmd, d) 152 runfetchcmd(svnfetchcmd, d)