diff options
author | Nick Lewis <nick.lewis@usa.g4s.com> | 2014-05-07 14:02:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 13:18:24 +0100 |
commit | 84396ed610e0fdbafad9b10c35a8b7f245220648 (patch) | |
tree | e217bf2791115706b8cc24247853b3165a241643 /bitbake | |
parent | b28a902253093b645d2e1526b07b723347abcf7a (diff) | |
download | poky-84396ed610e0fdbafad9b10c35a8b7f245220648.tar.gz |
bitbake: Fix refetch of local files when they are read only
(Bitbake rev: 42b7be1a6c5ff559f4a213eed04b370ca955460d)
(Bitbake rev: ad2f373fa29fcaf03934d96f7d69440254a259f0)
Signed-off-by: Nick Lewis <nick.lewis@usa.g4s.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5a03a0e46e..ee537bfe5f 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1255,7 +1255,7 @@ class FetchMethod(object): | |||
1255 | destdir = destdir.strip('/') | 1255 | destdir = destdir.strip('/') |
1256 | if destdir != "." and not os.access("%s/%s" % (rootdir, destdir), os.F_OK): | 1256 | if destdir != "." and not os.access("%s/%s" % (rootdir, destdir), os.F_OK): |
1257 | os.makedirs("%s/%s" % (rootdir, destdir)) | 1257 | os.makedirs("%s/%s" % (rootdir, destdir)) |
1258 | cmd = 'cp -pPR %s %s/%s/' % (file, rootdir, destdir) | 1258 | cmd = 'cp -fpPR %s %s/%s/' % (file, rootdir, destdir) |
1259 | #cmd = 'tar -cf - -C "%d" -ps . | tar -xf - -C "%s/%s/"' % (file, rootdir, destdir) | 1259 | #cmd = 'tar -cf - -C "%d" -ps . | tar -xf - -C "%s/%s/"' % (file, rootdir, destdir) |
1260 | else: | 1260 | else: |
1261 | # The "destdir" handling was specifically done for FILESPATH | 1261 | # The "destdir" handling was specifically done for FILESPATH |
@@ -1265,7 +1265,7 @@ class FetchMethod(object): | |||
1265 | else: | 1265 | else: |
1266 | destdir = "." | 1266 | destdir = "." |
1267 | bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) | 1267 | bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) |
1268 | cmd = 'cp %s %s/%s/' % (file, rootdir, destdir) | 1268 | cmd = 'cp -f %s %s/%s/' % (file, rootdir, destdir) |
1269 | 1269 | ||
1270 | if not cmd: | 1270 | if not cmd: |
1271 | return | 1271 | return |