diff options
| -rw-r--r-- | Utility/CopyFile.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error.mdwn | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index bb0600aa9..9f10cb790 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -23,11 +23,15 @@ copyFileExternal src dest = do removeFile dest boolSystem "cp" $ params ++ [File src, File dest] where +#ifndef __ANDROID__ params = map snd $ filter fst [ (SysConfig.cp_reflink_auto, Param "--reflink=auto") , (SysConfig.cp_a, Param "-a") , (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 - the file. -} diff --git a/debian/changelog b/debian/changelog index ae3c05817..be6a5798d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low 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 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 diff --git a/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error.mdwn b/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error.mdwn index acd559e43..560597632 100644 --- a/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error.mdwn +++ b/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error.mdwn @@ -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 .. u0_a141@android:/sdcard/git-annex.home/Documents $ """]] + +> Should be [[fixed|done]] --[[Joey]] |