diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-19 11:27:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-19 11:32:08 +0100 |
commit | b3cccaa6a896c41d8c9be5eebc327f726542d16b (patch) | |
tree | c720504a2882d4d9a4f7142a98df9f8f4b21ab0b | |
parent | f9cddaeef35b2ea0dadf717101ed896f6b857abd (diff) | |
download | bitbake-b3cccaa6a896c41d8c9be5eebc327f726542d16b.tar.gz |
fetch2/git: Use os.rename instead of mv
os.rename will overwrite the destination file if present so we can use this
instead of the process call overhead.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/git.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 3643a491d..e8ddf2c76 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -422,14 +422,14 @@ class Git(FetchMethod): # Create as a temp file and move atomically into position to avoid races @contextmanager - def create_atomic(filename, d): + def create_atomic(filename): fd, tfile = tempfile.mkstemp(dir=os.path.dirname(filename)) try: yield tfile umask = os.umask(0o666) os.umask(umask) os.chmod(tfile, (0o666 & ~umask)) - runfetchcmd("mv %s %s" % (tfile, filename), d) + os.rename(tfile, filename) finally: os.close(fd) @@ -443,7 +443,7 @@ class Git(FetchMethod): self.clone_shallow_local(ud, shallowclone, d) logger.info("Creating tarball of git repository") - with create_atomic(ud.fullshallow, d) as tfile: + with create_atomic(ud.fullshallow) as tfile: runfetchcmd("tar -czf %s ." % tfile, d, workdir=shallowclone) runfetchcmd("touch %s.done" % ud.fullshallow, d) finally: @@ -453,7 +453,7 @@ class Git(FetchMethod): os.unlink(ud.fullmirror) logger.info("Creating tarball of git repository") - with create_atomic(ud.fullmirror, d) as tfile: + with create_atomic(ud.fullmirror) as tfile: runfetchcmd("tar -czf %s ." % tfile, d, workdir=ud.clonedir) runfetchcmd("touch %s.done" % ud.fullmirror, d) |