summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Utility/Batch.hs4
-rw-r--r--debian/changelog3
-rw-r--r--doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn2
3 files changed, 9 insertions, 0 deletions
diff --git a/Utility/Batch.hs b/Utility/Batch.hs
index 61026f19e..cb3d918f3 100644
--- a/Utility/Batch.hs
+++ b/Utility/Batch.hs
@@ -52,7 +52,11 @@ getBatchCommandMaker = do
#ifndef mingw32_HOST_OS
nicers <- filterM (inPath . fst)
[ ("nice", [])
+#ifndef __ANDROID__
+ -- Android's ionice does not allow specifying a command,
+ -- so don't use it.
, ("ionice", ["-c3"])
+#else
, ("nocache", [])
]
return $ \(command, params) ->
diff --git a/debian/changelog b/debian/changelog
index 7a8727f79..8b7a27837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
done.
* 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
diff --git a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn b/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
index 94581a41b..35e751cce 100644
--- a/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
+++ b/doc/bugs/Android:_does_not_upload_added_files___40__neither_to___34__Transfer__34___or___34__Full_backup__34___server__41__.mdwn
@@ -80,3 +80,5 @@ Everything up-to-date
Invalid pid specified
~
]]
+
+> [[fixed|done]] --[[Joey]]