mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Android: Avoid trying to use Android's own ionice, which does not allow specifying a command to run. Fixes transferring files to/from android and probably a few other things.

Browse source
This commit is contained in:
Joey Hess 2013-12-29 17:32:08 -04:00
parent e3a71c006a
commit d6d5b0a6d8
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/Batch.hs
View file

@ -52,7 +52,11 @@ getBatchCommandMaker = do
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
nicers <- filterM (inPath . fst) nicers <- filterM (inPath . fst)
[ ("nice", []) [ ("nice", [])
#ifndef __ANDROID__
-- Android's ionice does not allow specifying a command,
-- so don't use it.
, ("ionice", ["-c3"]) , ("ionice", ["-c3"])
#else
, ("nocache", []) , ("nocache", [])
] ]
return $ \(command, params) -> return $ \(command, params) ->

3
debian/changelog vendored
View file

@ -15,6 +15,9 @@ git-annex (5.20131222) UNRELEASED; urgency=medium
rather than v4, and so the automatic direct mode upgrade to v5 was not rather than v4, and so the automatic direct mode upgrade to v5 was not
done. done.
* importfeed: Support youtube playlists. * importfeed: Support youtube playlists.
* Android: Avoid trying to use Android's own ionice, which does not
allow specifying a command to run. Fixes transferring files to/from
android and probably a few other things.
-- Joey Hess <joeyh@debian.org> Tue, 24 Dec 2013 13:54:32 -0400 -- Joey Hess <joeyh@debian.org> Tue, 24 Dec 2013 13:54:32 -0400

2
doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
View file

@ -80,3 +80,5 @@ Everything up-to-date
Invalid pid specified Invalid pid specified
~ ~
]] ]]
> [[fixed|done]] --[[Joey]]