Merge branch 'master' of ssh://git-annex.branchable.com

14 files changed, 229 insertions, 0 deletions

diff --git a/doc/Android/comment_18_1b46cdf154ddadfe17e4b6e4054dc619._comment b/doc/Android/comment_18_1b46cdf154ddadfe17e4b6e4054dc619._comment
new file mode 100644
index 000000000..bf9d79060
--- /dev/null
+++ b/doc/Android/comment_18_1b46cdf154ddadfe17e4b6e4054dc619._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="http://aap.liquidid.net/"
+ nickname="AAP"
+ subject="comment 18"
+ date="2013-05-30T11:23:58Z"
+ content="""
+I too get the 'link busybox: Read-only file system' message. Here is my phone info: 
+
+Phone: Samsung Galaxy Y GT-S5360 (rooted)   
+Android: 2.3.6 Gingerbread   
+BusyBox path: /system/xbin/ 
+
+
+Androids own terminal seems not to understand the d argument (-ld: No such file or directory) but over ssh 'ls -ld /data/data/ga.androidterm' returns
+     
+         drwxr-x--x    1 app_97   app_97           0 May 30 12:57 /data/data/ga.androidterm/
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_1_e8866dc15f8fc049229e7451addad1d5._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_1_e8866dc15f8fc049229e7451addad1d5._comment
new file mode 100644
index 000000000..3aaa01e06
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_1_e8866dc15f8fc049229e7451addad1d5._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-05-30T15:57:41Z"
+ content="""
+This is an intriguing screenshot, since it shows the webapp reporting a crash of the webapp! I think what's going on is that the web server thread run by the webapp is still running, although the webapp's own thread has crashed.
+
+The log should be in `/sdcard/DCIM/.git/annex/daemon.log`. I would be interested to see it.
+
+Does the webapp continue to update and function despite saying it crashed?
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_2_ee616b0251ffaace9844cfd7af896c35._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_2_ee616b0251ffaace9844cfd7af896c35._comment
new file mode 100644
index 000000000..b19fbf584
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_2_ee616b0251ffaace9844cfd7af896c35._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-05-30T16:07:59Z"
+ content="""
+Could you please get me a screenshot of git-annex's terminal window after this has occurred? 
+
+The most likely thing seems to be that it's crashing while trying to open the web browser. How did you get the web browser open on the webapp? Using the new menu item to do it, or did it automatically open?
+"""]]
diff --git a/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_3_6b8bd314b647ea3a485f5faf4856f9a9._comment b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_3_6b8bd314b647ea3a485f5faf4856f9a9._comment
new file mode 100644
index 000000000..88a99684a
--- /dev/null
+++ b/doc/bugs/warning_-_WebApp_crashed:___60__file_descriptor_15__62__:_hPutStr:_illegal_operation___40__handle_is_closed__41___on_Android/comment_3_6b8bd314b647ea3a485f5faf4856f9a9._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 3"
+ date="2013-05-30T16:30:31Z"
+ content="""
+Here's the screen capture : [http://i.imgur.com/owmuIKa.png](http://i.imgur.com/owmuIKa.png)
+
+I used the menu item to open the WebApp. Nothing appeared in the git-annex's terminal window when I opened the WebApp. The error message is the one that appears when I start Git Annex.
+
+The WebApp seems to be working. It synced a picture I took when the WebApp was already running. See : [http://i.imgur.com/Bcu4iAE.png](http://i.imgur.com/Bcu4iAE.png)
+
+I think I have this bug since the Android version is out. I thought maybe it was normal in the beginning.
+
+Here's the log :
+
+    [2013-05-30 12:15:36 EDT] main: starting assistant version 4.20130529-g6b9b452
+    \"_xmpp-client._tcp.gmail.com\"
+    Just [(5,0,5222,\"xmpp.l.google.com.\"),(20,0,5222,\"alt1.xmpp.l.google.com.\"),(20,0,5222,\"alt3.xmpp.l.google.com.\"),(20,0,5222,\"alt4.xmpp.l.google.com.\"),(20,0,5222,\"alt2.xmpp.l.google.com.\")]
+    (scanning...) [2013-05-30 12:15:37 EDT] Watcher: Performing startup scan
+    WebApp crashed: <file descriptor: 15>: hPutStr: illegal operation (handle is closed)
+    [2013-05-30 12:15:37 EDT] WebApp: warning WebApp crashed: <file descriptor: 15>: hPutStr: illegal operation (handle is closed)
+    (started...) [2013-05-30 12:22:02 EDT] Committer: Adding IMG_20130..22201.jpg
+
+    add Camera/IMG_20130530_122201.jpg (checksum...) [2013-05-30 12:22:02 EDT] Committer: Committing changes to git
+    [2013-05-30 12:22:13 EDT] Committer: Adding IMG_20130..22201.jpg
+    ok
+    (Recording state in git...)
+    (Recording state in git...)
+    add Camera/IMG_20130530_122201.jpg (checksum...) [2013-05-30 12:22:14 EDT] Committer: Committing changes to git
+    (gpg) 
+    [...]
+                            
+    [2013-05-30 12:22:50 EDT] Transferrer: Uploaded IMG_20130..22201.jpg
+"""]]
diff --git a/doc/forum/XBMC__44___NFS___38___git-annex_.txt b/doc/forum/XBMC__44___NFS___38___git-annex_.txt
new file mode 100644
index 000000000..fc5cd702a
--- /dev/null
+++ b/doc/forum/XBMC__44___NFS___38___git-annex_.txt
@@ -0,0 +1,27 @@
+Hi,
+
+this is not a git-annex problem, but more likely a way some software handles symlinks and/or do file-type detection.
+
+my setup is a following:
+- multiple pc/laptop (linux)
+- one NAS (debian) - main repo for music/films/photos - all in git-annex
+- a Raspberry Pi (Raspbmc) - connected to the TV
+
+I want to share all my films/music/.. to the Pi.
+So, i setup a r/o NFS and mounted that in the XBMC.
+So far this works, I see directories but XBMC do not recognize the media files.
+It works, if I "git-annex edit ..." the file.
+
+My _assumption_ is, that it follows the symlink, finds a file with no extension - and ignores that.
+In XBMC-config there is a list of supported filetypes by extension. ( .avi,.mpg,.foo,.bar )
+
+What I have think of so far:
+- tell XBMC somehow to load all the files (did not work)
+- having some kind of (FUSE?) filter, which hides the symlink in a transparent way
+- creating via script hard-links in a seperate folder with same structure, mount that.
+- using some alternative to NFS ( like ftp, smb ) or a other kind of media-server (server-side)
+
+any comments, ideas ? 
+If i find a solution, I'll post it here.
+
+.ka
diff --git a/doc/forum/XBMC__44___NFS___38___git-annex_/comment_1_86480f31d410e903766f82e6ecf83e1c._comment b/doc/forum/XBMC__44___NFS___38___git-annex_/comment_1_86480f31d410e903766f82e6ecf83e1c._comment
new file mode 100644
index 000000000..e82522548
--- /dev/null
+++ b/doc/forum/XBMC__44___NFS___38___git-annex_/comment_1_86480f31d410e903766f82e6ecf83e1c._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo"
+ nickname="Justin"
+ subject="Samba works"
+ date="2013-05-30T14:22:46Z"
+ content="""
+I use samba. Just need to set
+
+    unix extensions = no
+
+which causes samba to handle the symlinks internally.
+"""]]
diff --git a/doc/forum/XBMC__44___NFS___38___git-annex_/comment_2_d8ed4dd51d3050db691a8abdec24cd42._comment b/doc/forum/XBMC__44___NFS___38___git-annex_/comment_2_d8ed4dd51d3050db691a8abdec24cd42._comment
new file mode 100644
index 000000000..d2330e336
--- /dev/null
+++ b/doc/forum/XBMC__44___NFS___38___git-annex_/comment_2_d8ed4dd51d3050db691a8abdec24cd42._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-05-30T15:20:51Z"
+ content="""
+The default git-annex backend for over a year now is SHA256E, which includes the filename extension in the key to deal with programs that rely on them. If you're not using that backend, you can `git annex migrate` to it.
+
+Or you can turn on direct mode, which will certianly solve the problem.
+"""]]
diff --git a/doc/forum/ssh_password/comment_1_a3e5a41e1d4da683d577976b134b11ee._comment b/doc/forum/ssh_password/comment_1_a3e5a41e1d4da683d577976b134b11ee._comment
new file mode 100644
index 000000000..7ef938330
--- /dev/null
+++ b/doc/forum/ssh_password/comment_1_a3e5a41e1d4da683d577976b134b11ee._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://a-or-b.myopenid.com/"
+ ip="203.45.2.230"
+ subject="comment 1"
+ date="2013-05-30T00:08:52Z"
+ content="""
+It sounds like you don't have the ssh-agent set up properly in your environment.
+
+Try starting the git annex agent from the command line and see if that helps.  If it works then it is a problem with environment variables.
+"""]]
diff --git a/doc/forum/ssh_password/comment_2_fa261676a99d49d4b237b0d43048d76d._comment b/doc/forum/ssh_password/comment_2_fa261676a99d49d4b237b0d43048d76d._comment
new file mode 100644
index 000000000..b7a47c9fe
--- /dev/null
+++ b/doc/forum/ssh_password/comment_2_fa261676a99d49d4b237b0d43048d76d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-05-30T15:49:27Z"
+ content="""
+If you set this repository up using the git-annex webapp, and choosing \"remote ssh server\", it will generate a new ssh key, stored in `~/.ssh/git-annex/`, and it will configure `~/.ssh/config` to use this key for a special made-up hostname which is used in the url for the git remote. On the server, it will set up `~/.ssh/authorized_keys` to allow this ssh key to connect without a password and run git-annex-shell.
+
+I don't know if you used the webapp to set this up. If not, you can try to replicate this setup on your own. If you did and it's not working, you now know where all the peices it sets up are, to figure out what went wrong.
+"""]]
diff --git a/doc/install/cabal/comment_2_a69d17c55e56a707ec6606d5cdddee25._comment b/doc/install/cabal/comment_2_a69d17c55e56a707ec6606d5cdddee25._comment
new file mode 100644
index 000000000..5a7beea37
--- /dev/null
+++ b/doc/install/cabal/comment_2_a69d17c55e56a707ec6606d5cdddee25._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="E: Unable to locate package libghc-libxml-sax-dev"
+ date="2013-05-30T15:05:47Z"
+ content="""
+I get an error from the command as above:
+$ sudo apt-get install cabal-install libgnutls28-dev libgsasl7-dev c2hs libghc libxml-sax-dev zlib1g-dev libghc-zlib-dev
+
+$ lsb_release -a
+No LSB modules are available.
+Distributor ID:	Ubuntu
+Description:	Ubuntu 12.04.2 LTS
+Release:	12.04
+Codename:	precise
+
+"""]]
diff --git a/doc/install/cabal/comment_3_55bed050bdb768543dbe1b86edec057d._comment b/doc/install/cabal/comment_3_55bed050bdb768543dbe1b86edec057d._comment
new file mode 100644
index 000000000..7a53b2b64
--- /dev/null
+++ b/doc/install/cabal/comment_3_55bed050bdb768543dbe1b86edec057d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-05-30T15:25:29Z"
+ content="""
+If you're installing git-annex with cabal, there is no need to install any haskell library packages with apt-get. That includes libghc-libxml-sax-dev and libghc-zlib-dev. Without those, the apt-get line may work to install the C libraries needed for cabal to install the haskell libraries. 
+
+However, see the the [[Ubuntu]] page for much easier ways to get git-annex installed.
+"""]]
diff --git a/doc/install/cabal/comment_4_2ff7f8a3b03bea7e860248829d595bd1._comment b/doc/install/cabal/comment_4_2ff7f8a3b03bea7e860248829d595bd1._comment
new file mode 100644
index 000000000..4a04303ce
--- /dev/null
+++ b/doc/install/cabal/comment_4_2ff7f8a3b03bea7e860248829d595bd1._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="Re: Comment 3"
+ date="2013-05-30T15:48:44Z"
+ content="""
+@Joey Many thanks.
+I am new to Haskell (vaguely looked at it with DARCS) and git-annex.
+After installing with apt-get on Ubuntu 12.04 LTS I found webapp was missing, hence have come here.
+I am going through the correct steps now, it should be awesome when done.
+
+This seems to be a long build process (still going on my old laptop, much longer than apt-get).
+Ubuntu git-annex packages from 13.10 Saucy I think are updated to include webapp.
+"""]]
diff --git a/doc/install/cabal/comment_5_8789fc27466714faa5a3a7a6b8ec6e5d._comment b/doc/install/cabal/comment_5_8789fc27466714faa5a3a7a6b8ec6e5d._comment
new file mode 100644
index 000000000..52606082e
--- /dev/null
+++ b/doc/install/cabal/comment_5_8789fc27466714faa5a3a7a6b8ec6e5d._comment
@@ -0,0 +1,24 @@
+[[!comment format=txt
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="Re: Comment 3"
+ date="2013-05-30T16:29:12Z"
+ content="""
+At the end of the build I got these errors:
+Registering yesod-static-1.1.2.3...
+Installing library in /home/nrb/.cabal/lib/yesod-static-1.1.2.3/ghc-7.4.1
+Registering yesod-static-1.1.2.3...
+cabal: Error: some packages failed to install:
+c2hs-0.16.4 depends on language-c-0.3.2.1 which failed to install.
+dbus-0.10.4 depends on libxml-sax-0.7.4 which failed to install.
+git-annex-4.20130521.2 depends on libxml-sax-0.7.4 which failed to install.
+language-c-0.3.2.1 failed during the configure step. The exception was:
+ExitFailure 1
+libxml-sax-0.7.4 failed during the configure step. The exception was:
+ExitFailure 1
+network-protocol-xmpp-0.4.5 depends on libxml-sax-0.7.4 which failed to
+install.
+
+One way I could fix this myself is to put together a VM with 13.10 or Debian in it and work inside that.
+Or if I can get help to fix my issues here that would be great ;)
+"""]]
diff --git a/doc/install/cabal/comment_6_5afb2d081e8b603bc338cd460ad9317d._comment b/doc/install/cabal/comment_6_5afb2d081e8b603bc338cd460ad9317d._comment
new file mode 100644
index 000000000..1ff7b4f76
--- /dev/null
+++ b/doc/install/cabal/comment_6_5afb2d081e8b603bc338cd460ad9317d._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
+ nickname="Nigel"
+ subject="Some errors after the build"
+ date="2013-05-30T16:38:37Z"
+ content="""
+    Registering yesod-static-1.1.2.3...
+    Installing library in /home/nrb/.cabal/lib/yesod-static-1.1.2.3/ghc-7.4.1
+    Registering yesod-static-1.1.2.3...
+    cabal: Error: some packages failed to install:
+    c2hs-0.16.4 depends on language-c-0.3.2.1 which failed to install.
+    dbus-0.10.4 depends on libxml-sax-0.7.4 which failed to install.
+    git-annex-4.20130521.2 depends on libxml-sax-0.7.4 which failed to install.
+    language-c-0.3.2.1 failed during the configure step. The exception was:
+    ExitFailure 1
+    libxml-sax-0.7.4 failed during the configure step. The exception was:
+    ExitFailure 1
+    network-protocol-xmpp-0.4.5 depends on libxml-sax-0.7.4 which failed to
+    install.
+
+"""]]