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-08 16:17:05 +0100 |
commit | 138ed549920a27e28858e4a506fd423e913a014e (patch) | |
tree | 8b26f5537fa0ffa021ddbd4a419db4952f827b39 /bitbake/lib/bb | |
parent | 3189e74559b7e5c304d7b5f73192b0fa722d8d01 (diff) | |
download | poky-138ed549920a27e28858e4a506fd423e913a014e.tar.gz |
bitbake: Fix refetch of local files when they are read only
(Bitbake rev: 42b7be1a6c5ff559f4a213eed04b370ca955460d)
Signed-off-by: Nick Lewis <nick.lewis@usa.g4s.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-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 5a9c72f016..f571fc45e6 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1251,7 +1251,7 @@ class FetchMethod(object): | |||
1251 | destdir = destdir.strip('/') | 1251 | destdir = destdir.strip('/') |
1252 | if destdir != "." and not os.access("%s/%s" % (rootdir, destdir), os.F_OK): | 1252 | if destdir != "." and not os.access("%s/%s" % (rootdir, destdir), os.F_OK): |
1253 | os.makedirs("%s/%s" % (rootdir, destdir)) | 1253 | os.makedirs("%s/%s" % (rootdir, destdir)) |
1254 | cmd = 'cp -pPR %s %s/%s/' % (file, rootdir, destdir) | 1254 | cmd = 'cp -fpPR %s %s/%s/' % (file, rootdir, destdir) |
1255 | #cmd = 'tar -cf - -C "%d" -ps . | tar -xf - -C "%s/%s/"' % (file, rootdir, destdir) | 1255 | #cmd = 'tar -cf - -C "%d" -ps . | tar -xf - -C "%s/%s/"' % (file, rootdir, destdir) |
1256 | else: | 1256 | else: |
1257 | # The "destdir" handling was specifically done for FILESPATH | 1257 | # The "destdir" handling was specifically done for FILESPATH |
@@ -1261,7 +1261,7 @@ class FetchMethod(object): | |||
1261 | else: | 1261 | else: |
1262 | destdir = "." | 1262 | destdir = "." |
1263 | bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) | 1263 | bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) |
1264 | cmd = 'cp %s %s/%s/' % (file, rootdir, destdir) | 1264 | cmd = 'cp -f %s %s/%s/' % (file, rootdir, destdir) |
1265 | 1265 | ||
1266 | if not cmd: | 1266 | if not cmd: |
1267 | return | 1267 | return |