diff options
author | Matt Madison <matt@madison.systems> | 2016-08-21 08:02:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-24 13:55:36 +0100 |
commit | 0ed8975c42718342a104a9764a58816f964ec4ea (patch) | |
tree | bc1bed1c5f216d4ad63b5362874671702d6dcfd9 | |
parent | deab9a30987b225922490ca186c5307c15d45b82 (diff) | |
download | bitbake-contrib-0ed8975c42718342a104a9764a58816f964ec4ea.tar.gz |
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@madison.systems>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/__init__.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 7a3eb3c5a..65c426f8f 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 |