]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
fetch2: clean up remaining cwd saves/changes
authorMatt Madison <matt@madison.systems>
Sun, 21 Aug 2016 15:02:46 +0000 (08:02 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 24 Aug 2016 12:55:36 +0000 (13:55 +0100)
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>
lib/bb/fetch2/__init__.py

index 7a3eb3c5ab904210b18ed69f111058cc86de59c2..65c426f8fb9cbe1a90f185cefb11fbe3a1e55a3d 100644 (file)
@@ -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