diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/bzr.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/cvs.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/hg.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/repo.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/svk.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/svn.py | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 4e03fc9884..d6ad3bb99a 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -731,7 +731,7 @@ class FetchMethod(object): | |||
731 | destdir = urldata.path.rsplit("/", 1)[0] | 731 | destdir = urldata.path.rsplit("/", 1)[0] |
732 | else: | 732 | else: |
733 | destdir = "." | 733 | destdir = "." |
734 | bb.mkdirhier("%s/%s" % (rootdir, destdir)) | 734 | bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) |
735 | cmd = 'cp %s %s/%s/' % (file, rootdir, destdir) | 735 | cmd = 'cp %s %s/%s/' % (file, rootdir, destdir) |
736 | 736 | ||
737 | if not cmd: | 737 | if not cmd: |
@@ -742,7 +742,7 @@ class FetchMethod(object): | |||
742 | os.chdir(rootdir) | 742 | os.chdir(rootdir) |
743 | if 'subdir' in urldata.parm: | 743 | if 'subdir' in urldata.parm: |
744 | newdir = ("%s/%s" % (rootdir, urldata.parm.get('subdir'))) | 744 | newdir = ("%s/%s" % (rootdir, urldata.parm.get('subdir'))) |
745 | bb.mkdirhier(newdir) | 745 | bb.utils.mkdirhier(newdir) |
746 | os.chdir(newdir) | 746 | os.chdir(newdir) |
747 | 747 | ||
748 | cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, True), cmd) | 748 | cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, True), cmd) |
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 454961eff0..201705b6ce 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py | |||
@@ -93,7 +93,7 @@ class Bzr(FetchMethod): | |||
93 | bzrcmd = self._buildbzrcommand(ud, d, "fetch") | 93 | bzrcmd = self._buildbzrcommand(ud, d, "fetch") |
94 | bb.fetch2.check_network_access(d, bzrcmd, ud.url) | 94 | bb.fetch2.check_network_access(d, bzrcmd, ud.url) |
95 | logger.debug(1, "BZR Checkout %s", loc) | 95 | logger.debug(1, "BZR Checkout %s", loc) |
96 | bb.mkdirhier(ud.pkgdir) | 96 | bb.utils.mkdirhier(ud.pkgdir) |
97 | os.chdir(ud.pkgdir) | 97 | os.chdir(ud.pkgdir) |
98 | logger.debug(1, "Running %s", bzrcmd) | 98 | logger.debug(1, "Running %s", bzrcmd) |
99 | runfetchcmd(bzrcmd, d) | 99 | runfetchcmd(bzrcmd, d) |
diff --git a/bitbake/lib/bb/fetch2/cvs.py b/bitbake/lib/bb/fetch2/cvs.py index 12d11e0d5b..a111467bfc 100644 --- a/bitbake/lib/bb/fetch2/cvs.py +++ b/bitbake/lib/bb/fetch2/cvs.py | |||
@@ -139,7 +139,7 @@ class Cvs(FetchMethod): | |||
139 | else: | 139 | else: |
140 | logger.info("Fetch " + loc) | 140 | logger.info("Fetch " + loc) |
141 | # check out sources there | 141 | # check out sources there |
142 | bb.mkdirhier(pkgdir) | 142 | bb.utils.mkdirhier(pkgdir) |
143 | os.chdir(pkgdir) | 143 | os.chdir(pkgdir) |
144 | logger.debug(1, "Running %s", cvscmd) | 144 | logger.debug(1, "Running %s", cvscmd) |
145 | bb.fetch2.check_network_access(d, cvscmd, ud.url) | 145 | bb.fetch2.check_network_access(d, cvscmd, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index f2c27e42a7..1679f81511 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -116,7 +116,7 @@ class Git(FetchMethod): | |||
116 | 116 | ||
117 | # If the checkout doesn't exist and the mirror tarball does, extract it | 117 | # If the checkout doesn't exist and the mirror tarball does, extract it |
118 | if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror): | 118 | if not os.path.exists(ud.clonedir) and os.path.exists(ud.fullmirror): |
119 | bb.mkdirhier(ud.clonedir) | 119 | bb.utils.mkdirhier(ud.clonedir) |
120 | os.chdir(ud.clonedir) | 120 | os.chdir(ud.clonedir) |
121 | runfetchcmd("tar -xzf %s" % (ud.fullmirror), d) | 121 | runfetchcmd("tar -xzf %s" % (ud.fullmirror), d) |
122 | 122 | ||
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index 6a56f8d0cd..35a4b3c30a 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py | |||
@@ -131,7 +131,7 @@ class Hg(FetchMethod): | |||
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 | bb.fetch2.check_network_access(d, fetchcmd, ud.url) | 137 | bb.fetch2.check_network_access(d, fetchcmd, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 4bf411c24f..7c4c90c715 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
@@ -96,7 +96,7 @@ class Osc(FetchMethod): | |||
96 | oscfetchcmd = self._buildosccommand(ud, d, "fetch") | 96 | oscfetchcmd = self._buildosccommand(ud, d, "fetch") |
97 | logger.info("Fetch " + loc) | 97 | logger.info("Fetch " + loc) |
98 | # check out sources there | 98 | # check out sources there |
99 | bb.mkdirhier(ud.pkgdir) | 99 | bb.utils.mkdirhier(ud.pkgdir) |
100 | os.chdir(ud.pkgdir) | 100 | os.chdir(ud.pkgdir) |
101 | logger.debug(1, "Running %s", oscfetchcmd) | 101 | logger.debug(1, "Running %s", oscfetchcmd) |
102 | bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) | 102 | bb.fetch2.check_network_access(d, oscfetchcmd, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 6347834c76..cbdc84853c 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -152,7 +152,7 @@ class Perforce(FetchMethod): | |||
152 | 152 | ||
153 | # create temp directory | 153 | # create temp directory |
154 | logger.debug(2, "Fetch: creating temporary directory") | 154 | logger.debug(2, "Fetch: creating temporary directory") |
155 | bb.mkdirhier(data.expand('${WORKDIR}', localdata)) | 155 | bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) |
156 | data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata) | 156 | data.setVar('TMPBASE', data.expand('${WORKDIR}/oep4.XXXXXX', localdata), localdata) |
157 | tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") | 157 | tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") |
158 | tmpfile = tmppipe.readline().strip() | 158 | tmpfile = tmppipe.readline().strip() |
diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py index 54130a8c3b..8300da8c5a 100644 --- a/bitbake/lib/bb/fetch2/repo.py +++ b/bitbake/lib/bb/fetch2/repo.py | |||
@@ -69,7 +69,7 @@ class Repo(FetchMethod): | |||
69 | else: | 69 | else: |
70 | username = "" | 70 | username = "" |
71 | 71 | ||
72 | bb.mkdirhier(os.path.join(codir, "repo")) | 72 | bb.utils.mkdirhier(os.path.join(codir, "repo")) |
73 | os.chdir(os.path.join(codir, "repo")) | 73 | os.chdir(os.path.join(codir, "repo")) |
74 | if not os.path.exists(os.path.join(codir, "repo", ".repo")): | 74 | if not os.path.exists(os.path.join(codir, "repo", ".repo")): |
75 | 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) | 75 | 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/bitbake/lib/bb/fetch2/svk.py b/bitbake/lib/bb/fetch2/svk.py index 6211cac8d3..9d34abf3da 100644 --- a/bitbake/lib/bb/fetch2/svk.py +++ b/bitbake/lib/bb/fetch2/svk.py | |||
@@ -75,7 +75,7 @@ class Svk(FetchMethod): | |||
75 | localdata = data.createCopy(d) | 75 | localdata = data.createCopy(d) |
76 | data.update_data(localdata) | 76 | data.update_data(localdata) |
77 | logger.debug(2, "Fetch: creating temporary directory") | 77 | logger.debug(2, "Fetch: creating temporary directory") |
78 | bb.mkdirhier(data.expand('${WORKDIR}', localdata)) | 78 | bb.utils.mkdirhier(data.expand('${WORKDIR}', localdata)) |
79 | data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) | 79 | data.setVar('TMPBASE', data.expand('${WORKDIR}/oesvk.XXXXXX', localdata), localdata) |
80 | tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") | 80 | tmppipe = os.popen(data.getVar('MKTEMPDIRCMD', localdata, True) or "false") |
81 | tmpfile = tmppipe.readline().strip() | 81 | tmpfile = tmppipe.readline().strip() |
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index ac4fd27e14..607bdd0cd4 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py | |||
@@ -122,7 +122,7 @@ class Svn(FetchMethod): | |||
122 | svnfetchcmd = self._buildsvncommand(ud, d, "fetch") | 122 | svnfetchcmd = self._buildsvncommand(ud, d, "fetch") |
123 | logger.info("Fetch " + loc) | 123 | logger.info("Fetch " + loc) |
124 | # check out sources there | 124 | # check out sources there |
125 | bb.mkdirhier(ud.pkgdir) | 125 | bb.utils.mkdirhier(ud.pkgdir) |
126 | os.chdir(ud.pkgdir) | 126 | os.chdir(ud.pkgdir) |
127 | logger.debug(1, "Running %s", svnfetchcmd) | 127 | logger.debug(1, "Running %s", svnfetchcmd) |
128 | bb.fetch2.check_network_access(d, svnfetchcmd, ud.url) | 128 | bb.fetch2.check_network_access(d, svnfetchcmd, ud.url) |