Android: Fix use of cp command to not try to use features present only on build system.
This commit is contained in:
parent
fe53456c1d
commit
923d6c81bc
3 changed files with 8 additions and 0 deletions
|
@ -23,11 +23,15 @@ copyFileExternal src dest = do
|
||||||
removeFile dest
|
removeFile dest
|
||||||
boolSystem "cp" $ params ++ [File src, File dest]
|
boolSystem "cp" $ params ++ [File src, File dest]
|
||||||
where
|
where
|
||||||
|
#ifndef __ANDROID__
|
||||||
params = map snd $ filter fst
|
params = map snd $ filter fst
|
||||||
[ (SysConfig.cp_reflink_auto, Param "--reflink=auto")
|
[ (SysConfig.cp_reflink_auto, Param "--reflink=auto")
|
||||||
, (SysConfig.cp_a, Param "-a")
|
, (SysConfig.cp_a, Param "-a")
|
||||||
, (SysConfig.cp_p && not SysConfig.cp_a, Param "-p")
|
, (SysConfig.cp_p && not SysConfig.cp_a, Param "-p")
|
||||||
]
|
]
|
||||||
|
#else
|
||||||
|
params = []
|
||||||
|
#endif
|
||||||
|
|
||||||
{- Create a hard link if the filesystem allows it, and fall back to copying
|
{- Create a hard link if the filesystem allows it, and fall back to copying
|
||||||
- the file. -}
|
- the file. -}
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -18,6 +18,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low
|
||||||
master branch on such a remote, instead of to synced/master. This
|
master branch on such a remote, instead of to synced/master. This
|
||||||
makes it easier to clone from a bare git remote that has been populated
|
makes it easier to clone from a bare git remote that has been populated
|
||||||
with git annex sync or by the assistant.
|
with git annex sync or by the assistant.
|
||||||
|
* Android: Fix use of cp command to not try to use features present
|
||||||
|
only on build system.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400
|
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400
|
||||||
|
|
||||||
|
|
|
@ -33,3 +33,5 @@ drwxrwxr-x 2 root sdcard_r 4096 Jun 14 13:42 .
|
||||||
drwxrwxr-x 6 root sdcard_r 4096 Jun 14 13:35 ..
|
drwxrwxr-x 6 root sdcard_r 4096 Jun 14 13:35 ..
|
||||||
u0_a141@android:/sdcard/git-annex.home/Documents $
|
u0_a141@android:/sdcard/git-annex.home/Documents $
|
||||||
"""]]
|
"""]]
|
||||||
|
|
||||||
|
> Should be [[fixed|done]] --[[Joey]]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue