[oe-commits] [bitbake] branch master-next updated: fetch2: clean up remaining cwd saves/changes
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 24 12:59:36 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
The following commit(s) were added to refs/heads/master-next by this push:
new 0ed8975 fetch2: clean up remaining cwd saves/changes
0ed8975 is described below
commit 0ed8975c42718342a104a9764a58816f964ec4ea
Author: Matt Madison <matt at madison.systems>
AuthorDate: Sun Aug 21 08:02:46 2016 -0700
fetch2: clean up remaining cwd saves/changes
Now that the fetchers all preserve the current working
directory, the cwd changes in the try_mirror_url,
download, and checkstatus methods are no longer needed.
Signed-off-by: Matt Madison <matt at madison.systems>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/fetch2/__init__.py | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 7a3eb3c..65c426f 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -935,8 +935,6 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
return found
return False
- os.chdir(ld.getVar("DL_DIR", True))
-
if not verify_donestamp(ud, ld, origud) or ud.method.need_update(ud, ld):
ud.method.download(ud, ld)
if hasattr(ud.method,"build_mirror_data"):
@@ -1553,8 +1551,6 @@ class Fetch(object):
network = self.d.getVar("BB_NO_NETWORK", True)
premirroronly = (self.d.getVar("BB_FETCH_PREMIRRORONLY", True) == "1")
- save_cwd = os.getcwd()
-
for u in urls:
ud = self.ud[u]
ud.setup_localpath(self.d)
@@ -1577,8 +1573,6 @@ class Fetch(object):
if premirroronly:
self.d.setVar("BB_NO_NETWORK", "1")
- os.chdir(self.d.getVar("DL_DIR", True))
-
firsterr = None
verified_stamp = verify_donestamp(ud, self.d)
if not localpath and (not verified_stamp or m.need_update(ud, self.d)):
@@ -1629,7 +1623,6 @@ class Fetch(object):
raise
finally:
- os.chdir(save_cwd)
if ud.lockfile:
bb.utils.unlockfile(lf)
@@ -1638,8 +1631,6 @@ class Fetch(object):
Check all urls exist upstream
"""
- save_cwd = os.getcwd()
-
if not urls:
urls = self.urls
@@ -1663,8 +1654,6 @@ class Fetch(object):
if not ret:
raise FetchError("URL %s doesn't work" % u, u)
- os.chdir(save_cwd)
-
def unpack(self, root, urls=None):
"""
Check all urls exist upstream
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list