diff options
author | Joey Hess <joey@kitenet.net> | 2013-07-27 17:42:51 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-07-27 17:42:51 -0400 |
commit | 6662b174fd05467d783f0dab7eb031a4a599e1a1 (patch) | |
tree | 1b4c2804d20185fb64da845251d1c6ef45d80a45 | |
parent | 3a55197bdb0c6bed93c4838f26af9bec7e414cdb (diff) | |
parent | 2ef417c9ff716090aee5718c55dcd245b41ceb6f (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r-- | doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment | 41 | ||||
-rw-r--r-- | doc/install/Ubuntu/comment_5_fbb5306a162db1a1ee9efa3523aac952._comment | 11 |
2 files changed, 52 insertions, 0 deletions
diff --git a/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment b/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment new file mode 100644 index 000000000..fce51ac32 --- /dev/null +++ b/doc/bugs/utf8/comment_13_7044d2c5bb1c91ee37eb9868963a1ff2._comment @@ -0,0 +1,41 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.110" + subject="comment 13" + date="2013-07-27T20:46:01Z" + content=""" +I've verified that the (old) code correctly returned no path when it's too long: + +<pre> +*Annex.Ssh System.Directory System.Posix.Directory Annex Git.Construct Git.Config System.Posix.Env Utility.Env> eval (newState r') $ changeGitConfig (\c -> c { annexCrippledFileSystem = True }) >> sshInfo (\"fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\", Nothing) +(Nothing,[]) +</pre> + +In case the problem was somehow related to calculating the length on Android (ie, Data.Bits.Utils broken), I built a small program that calculated the length of the string the same way + +[[!format haskell \"\"\" +import Utility.FileSystemEncoding + +main = do + let s = \"/data/data/ga.androidterm/tmp/fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\" + let ws = decodeW8 s + print (length ws) +\"\"\"]] + +Outputs 110 on Android as expected. + +Finally, using git-annex 4.20130721-g002de3e on Android (a newer version than the bug reporter's but with no changes to Annex.Ssh), I manually set up a repository using the same hostname: + +<pre> +[remote \"foo\"] + url = ssh://fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq + fetch = +refs/heads/*:refs/remotes/foo/* + annex-uuid = dummy +</pre> + +And still cannot replicate the bug; as expected it does not use the socket since it's too long: + +copy foo (checking foo...) [2013-07-27 16:40:42 EDT] call: ssh [\"-T\",\"fozz@git-annex-markdown.lang.speechmarks.com-fozz_phone.2Dannex.IdWwlXHtSsjVUMcq\",\"git-annex-shell 'inannex' '' 'SHA256E-s29--093429efb0d1427753d1f038f5279ec4df66785a1b2429b3fa5e3a01bcb75bd8' --uuid 111\"] + +So, I don't understand how this could have happened. Although my recent changes mean it'll use a 62 byte path max on Android now, which certianly should avoid the problem, even if there's some actual bug here that I cannot reproduce. +"""]] diff --git a/doc/install/Ubuntu/comment_5_fbb5306a162db1a1ee9efa3523aac952._comment b/doc/install/Ubuntu/comment_5_fbb5306a162db1a1ee9efa3523aac952._comment new file mode 100644 index 000000000..fc525af96 --- /dev/null +++ b/doc/install/Ubuntu/comment_5_fbb5306a162db1a1ee9efa3523aac952._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.246.110" + subject="comment 5" + date="2013-07-27T20:12:33Z" + content=""" +Jeff, AFAIK the 3.20120406 in precise does not include the assistant at all. The Precise PPA is well up-to-date. +I don't think git-annex has anyone in Ubuntu updating the package, so it's whatever version is synced periodically from Debian. + +(AFAICS, all the problems Jeff had were due to manually creating an indirect mode repository when he expected direct mode.) +"""]] |