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

8 files changed, 159 insertions, 0 deletions

diff --git a/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_2_b91f9337b7ed536539bb3236b7552d82._comment b/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_2_b91f9337b7ed536539bb3236b7552d82._comment
new file mode 100644
index 000000000..db88d6b5d
--- /dev/null
+++ b/doc/bugs/__34__metadata_only__34___git-remote-gcrypt_syncing_files_anyway/comment_2_b91f9337b7ed536539bb3236b7552d82._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="chris@f4ea67aa5ae4709d79959f782fcebb5edae9a79b"
+ nickname="chris"
+ subject="comment 2"
+ date="2016-06-07T13:40:24Z"
+ content="""
+The way I got round this was to give the metadata-only repository an annex-uuid of 00000000-0000-0000-0000-000000000000, and to run \"git annex wanted remotename nothing\".  Now everything works as I want, whether with the assistant or when I run git annex sync --content [--all] manually.
+"""]]
diff --git a/doc/bugs/content_not_present__58___cannot_lock.mdwn b/doc/bugs/content_not_present__58___cannot_lock.mdwn
new file mode 100644
index 000000000..ddf86f44b
--- /dev/null
+++ b/doc/bugs/content_not_present__58___cannot_lock.mdwn
@@ -0,0 +1,25 @@
+### Please describe the problem.
+Cannot lock files which are not present.  This prevents converting v6 files from flat files to symlinks when they are missing.
+If a file is not present, locking it should either replace it with a broken symlink, or continue on to the next file with a warning.
+
+### What steps will reproduce the problem?
+I think this happened from unlocking a file in one v6 repo and syncing with a different v6 repo, perhaps via a v5 repo in the middle.  In repo #2, the file became unlocked but missing for me.
+
+### What version of git-annex are you using? On what operating system?
+6.20160528-g191d2ba on linux
+
+### Please provide any additional information below.
+
+[[!format sh """
+
+# I am trying to lock all files in my repo to downgrade from v6 back to v5, for stability
+
+$ git annex lock
+lock git/bup.git/bupindex.hlink git-annex: content not present; cannot lock
+
+# but I cannot
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+
diff --git a/doc/bugs/content_not_present__58___cannot_lock/comment_1_9a9a53d85660531cc3843dc9f339f187._comment b/doc/bugs/content_not_present__58___cannot_lock/comment_1_9a9a53d85660531cc3843dc9f339f187._comment
new file mode 100644
index 000000000..d09bc9ed2
--- /dev/null
+++ b/doc/bugs/content_not_present__58___cannot_lock/comment_1_9a9a53d85660531cc3843dc9f339f187._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="xloem"
+ subject="comment 1"
+ date="2016-06-05T02:57:42Z"
+ content="""
+comment to get replies emailed
+"""]]
diff --git a/doc/download/comment_5_46d4f8bba77ec52a5bffcf5b2591dc36._comment b/doc/download/comment_5_46d4f8bba77ec52a5bffcf5b2591dc36._comment
new file mode 100644
index 000000000..be12a7e3f
--- /dev/null
+++ b/doc/download/comment_5_46d4f8bba77ec52a5bffcf5b2591dc36._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Roksolana"
+ subject="Coment 5"
+ date="2016-06-06T14:59:08Z"
+ content="""
+Long Path Tool” is very helpful for this error !
+You can use to solve this problem
+thanks
+"""]]
diff --git a/doc/forum/Building_Android_app_fails.mdwn b/doc/forum/Building_Android_app_fails.mdwn
new file mode 100644
index 000000000..bf0e69ecb
--- /dev/null
+++ b/doc/forum/Building_Android_app_fails.mdwn
@@ -0,0 +1,69 @@
+When trying to build the Android app, I'm able to successfully set up the chroot, and enter it. Once I am inside, as the user "builder" I get a failure on the second step of the installation process "In the chroot, run standalone/android/install-haskell-packages".
+
+When I run this command, I get the following error:
+
+    cbits/cryptonite_rdrand.c: In function ‘cryptonite_get_rand_bytes’:
+    
+    cbits/cryptonite_rdrand.c:63:2:
+         error: inconsistent operand constraints in an ‘asm’
+          asm(".byte 0x48,0x0f,0xc7,0xf0; setc %1" \
+          ^
+    
+    cbits/cryptonite_rdrand.c:78:3:
+         note: in expansion of macro ‘inline_rdrand_rax’
+           inline_rdrand_rax(tmp, ok);
+           ^
+    
+    cbits/cryptonite_rdrand.c:63:2:
+         error: inconsistent operand constraints in an ‘asm’
+          asm(".byte 0x48,0x0f,0xc7,0xf0; setc %1" \
+          ^
+    
+    cbits/cryptonite_rdrand.c:87:3:
+         note: in expansion of macro ‘inline_rdrand_rax’
+           inline_rdrand_rax(tmp, ok);
+           ^
+    
+    cbits/cryptonite_rdrand.c:63:2:
+         error: inconsistent operand constraints in an ‘asm’
+          asm(".byte 0x48,0x0f,0xc7,0xf0; setc %1" \
+          ^
+    
+    cbits/cryptonite_rdrand.c:87:3:
+         note: in expansion of macro ‘inline_rdrand_rax’
+           inline_rdrand_rax(tmp, ok);
+           ^
+    
+    cbits/cryptonite_rdrand.c:63:2:
+         error: inconsistent operand constraints in an ‘asm’
+          asm(".byte 0x48,0x0f,0xc7,0xf0; setc %1" \
+          ^
+    
+    cbits/cryptonite_rdrand.c:94:3:
+         note: in expansion of macro ‘inline_rdrand_rax’
+           inline_rdrand_rax(tmp, ok);
+           ^
+    cabal: Error: some packages failed to install:
+    cryptonite-0.16 failed during the building phase. The exception was:
+    ExitFailure 1
+
+So, there is a problem with building the haskell package "cryptonite-0.16".
+
+I also get this output a little further up:
+
+    Failed to install cryptonite-0.16
+    Build log ( /home/builder/.cabal/logs/cryptonite-0.16.log ):
+    Warning: cryptonite.cabal: Unknown fields: extra-doc-files (line 37)
+    Fields allowed in this section:
+    name, version, cabal-version, build-type, license, license-file,
+    copyright, maintainer, build-depends, stability, homepage,
+    package-url, bug-reports, synopsis, description, category, author,
+    tested-with, data-files, data-dir, extra-source-files,
+    extra-tmp-files
+
+So perhaps that is helpful as well.
+
+
+If anyone has any guidance on how to move beyond this or what needs to be changed, I'd appreciate it!
+
+Thanks!
diff --git a/doc/forum/Structure_needs_cleaning_git-annex__58___fd__58__15__58___hGetLine__58___end_of_file/comment_1_7bcc0111015985bde398a2a1a02b28ba._comment b/doc/forum/Structure_needs_cleaning_git-annex__58___fd__58__15__58___hGetLine__58___end_of_file/comment_1_7bcc0111015985bde398a2a1a02b28ba._comment
new file mode 100644
index 000000000..02c18f876
--- /dev/null
+++ b/doc/forum/Structure_needs_cleaning_git-annex__58___fd__58__15__58___hGetLine__58___end_of_file/comment_1_7bcc0111015985bde398a2a1a02b28ba._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="juh"
+ subject="SOLVED"
+ date="2016-06-06T15:45:12Z"
+ content="""
+I solved the problem with fsck the disk.
+"""]]
diff --git a/doc/forum/What_am_I_doing_wrong_with_move__63__/comment_3_f2770f86138d9b8489fbf9a25462b4ce._comment b/doc/forum/What_am_I_doing_wrong_with_move__63__/comment_3_f2770f86138d9b8489fbf9a25462b4ce._comment
new file mode 100644
index 000000000..e0c0d3aaf
--- /dev/null
+++ b/doc/forum/What_am_I_doing_wrong_with_move__63__/comment_3_f2770f86138d9b8489fbf9a25462b4ce._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="Gus"
+ subject="I think I have figured out something"
+ date="2016-06-05T22:42:17Z"
+ content="""
+When I `git-annex drop --force` a file from my direct repository, it gets replaced by a symbolic-link-like file, containing a path.
+Then, when I `git-annex sync` the repository to propagate the changes I have made, the file's content gets updated as if the file has been replaced.
+
+My question is then: why does the original file gets replaced by the link-like file when I drop it?
+"""]]
diff --git a/doc/forum/git-annex__58___getUserEntryForID__58___does_not_exist___40__no_such_user__41___.mdwn b/doc/forum/git-annex__58___getUserEntryForID__58___does_not_exist___40__no_such_user__41___.mdwn
new file mode 100644
index 000000000..247407dfe
--- /dev/null
+++ b/doc/forum/git-annex__58___getUserEntryForID__58___does_not_exist___40__no_such_user__41___.mdwn
@@ -0,0 +1,24 @@
+Hi,
+
+I ran into this problem:
+$ git annex mirror --from origin
+git-annex: getUserEntryForID: does not exist (no such user)
+
+I found in the forum that, if the the machine uses LDAP etc. I should be able to use the HOME and USER environment variables.
+
+I'm not quite sure what the user authentication management on the machine I'm on is and I'd rather not deal with the sysadmins.
+But I know that  the /etc/passwd file does not have my user listed.
+I do have the the HOME and USER variables properly set and exported. 
+
+$ echo $HOME $USER
+/nethome/iiossifov iiossifov
+
+In the git-annex source code I found that the error occurs in Utility/UserInfo.hs. 
+I can't read Haskell but my guess is that the problem is with the myUserGecos for which there is no environment variable fall back.
+
+I'm using the pre-build git-annex version: 6.20160527-gb7d4774
+
+Would you be able to advice me how to deal with the problem?
+
+Thank you,
+Ivan