summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-01 10:53:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 11:23:41 +0000
commit13061ed1e1f347589d6955d5cc50a50574b00218 (patch)
tree04d141c77d9721620cd62fd31452ba34df5a7950
parent1f694e4cb493b0737b6009382c0957e6837ebbed (diff)
downloadopenembedded-core-13061ed1e1f347589d6955d5cc50a50574b00218.tar.gz
openembedded-core-13061ed1e1f347589d6955d5cc50a50574b00218.tar.bz2
openembedded-core-13061ed1e1f347589d6955d5cc50a50574b00218.zip
scripts/cp-noerror: Avoid a race
Its possible something can delete $1 (since it may be empty) whilst cp-noerror is starting. Add an exception to handle this issue since if this happens, we shouldn't return an error. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/cp-noerror5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cp-noerror b/scripts/cp-noerror
index 474f7aa80a..28eb90d4a0 100755
--- a/scripts/cp-noerror
+++ b/scripts/cp-noerror
@@ -2,6 +2,7 @@
#
# Allow copying of $1 to $2 but if files in $1 disappear during the copy operation,
# don't error.
+# Also don't error if $1 disappears.
#
import sys
@@ -47,5 +48,5 @@ try:
copytree(sys.argv[1], sys.argv[2])
except shutil.Error:
pass
-
-
+except OSError:
+ pass