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

This commit is contained in:
Joey Hess 2014-05-16 13:42:47 -04:00
commit b185e7d8e3
14 changed files with 218 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 2"
date="2014-05-16T17:24:00Z"
content="""
This bug report is about *Android*, not OSX. Please file a new bug report about any similar problem you might have with OSX.
(AFAICS, OSX systems do have a /etc/resolv.conf, so perhaps your system is broken?)
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
nickname="Ovidiu"
subject="comment 3"
date="2014-05-16T17:26:59Z"
content="""
ah, no I spotted the ADNROID in the title, sorry.
I will open a new bug report then, I do have a resolv.conf:
ls -al /etc/resolv.conf
lrwxr-xr-x 1 root wheel 22 Nov 2 2013 /etc/resolv.conf -> ../var/run/resolv.conf
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 4"
date="2014-05-16T17:30:21Z"
content="""
You have a symlink to a file that may or may not exist. I'd check if the file exists, and if your user can read it before fileing a bug report.
"""]]

View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
nickname="Ovidiu"
subject="comment 5"
date="2014-05-16T17:37:29Z"
content="""
I can read it just fine:
cat /etc/resolv.conf
#
# Mac OS X Notice
#
# This file is not used by the host name and address resolution
# or the DNS query routing mechanisms used by most processes on
# this Mac OS X system.
#
# This file is automatically generated.
#
nameserver 172.20.10.1
"""]]

View file

@ -0,0 +1,35 @@
### Please describe the problem.
[2014-05-13 00:01:18 SAST] Cronner: Consistency check in progress
[2014-05-13 00:29:49 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup
[2014-05-13 08:42:48 SAST] main: starting assistant version 5.20140420-ga25b8bb
Already up-to-date.
(scanning...) [2014-05-13 08:42:49 SAST] Watcher: Performing startup scan
[2014-05-13 08:42:50 SAST] Upgrader: An upgrade of git-annex is available. (version 5.20140421)
(started...) [2014-05-13 13:31:46 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup
git-annex: /etc/resolv.conf: openFile: does not exist (No such file or directory)
[2014-05-13 18:34:12 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup
[2014-05-13 19:34:12 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup
[2014-05-13 19:46:48 SAST] main: starting assistant version 5.20140420-ga25b8bb
Already up-to-date.
(scanning...) [2014-05-13 19:50:06 SAST] Watcher: Performing startup scan
### What steps will reproduce the problem?
I don't know, simply saw the error in my logs.
### What version of git-annex are you using? On what operating system?
Version: 5.20140420-ga25b8bb
Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
Maac OSX 10.9.2
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 4"
date="2014-05-16T17:36:10Z"
content="""
\"Cannot find old distribution bundle; not upgrading\"
This message means that git-annex was unable to find where the old version was installed, which it needs to do in order to replace it with the new version. It looks for a `git-annex.app` directory, and could not find one. How did you install the old version, and to what location?
I think it might try to upload the dmg file to a repository if that repository is set as a full backup and so wants all files even ones not in the work tree.
"""]]

View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 1"
date="2014-05-16T17:17:54Z"
content="""
Here's how I do it:
<pre>
$ oberon:tmp joeyh$ hdiutil attach git-annex.dmg
$ oberon:tmp joeyh$ /Volumes/git-annex/git-annex.app/Contents/MacOS/git-annex version
git-annex version: 5.20140516-g693a6a4
oberon:tmp joeyh$ PATH=$PATH:/Volumes/git-annex/git-annex.app/Contents/MacOS/
oberon:tmp joeyh$ git-annex version
git-annex version: 5.20140516-g693a6a4
</pre>
So, adding to PATH works fine. Perhaps you added the wrong directory to your PATH.
Note that .bash_profile is only used for bash login shells. It may not be run when you open a terminal, or when git-annex ssh's in from elsewhere to run git-annex-shell (which you seem to be asking about, but only in the title of this page?).
In particular, bash does not provide any way to set the PATH which works when you run \"ssh yourcomputer git-annex-shell\". So you will need to instead move the git-annex files into a directory that is in the default PATH.
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
nickname="Ovidiu"
subject="comment 2"
date="2014-05-16T17:23:32Z"
content="""
Thanks for the additional info, for now its working fine:
git-annex version
git-annex version: 5.20140420-ga25b8bb
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 1"
date="2014-05-16T17:20:22Z"
content="""
Also note that bash goes out of its way to make it stupidly hard for users to add things to PATH. There are different dotfiles that it reads in different situations, and no dotfile it reads in all situations. In particular, \"ssh somebox git-annex-shell\" will avoid reading any dotfiles that could set PATH, AFAICS.
"""]]