mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OSX: Corrected the location of trustedkeys.gpg, so the built-in upgrade code will find it. Fixes OSX upgrade going forward, but older versions won't upgrade themselves due to this problem.

Browse source
This commit is contained in:
Joey Hess 2015-05-22 13:41:47 -04:00
parent 38e70fbc1a
commit 1b01322de0
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -174,7 +174,7 @@ osxapp: Build/Standalone Build/OSXMkLibs
ln -sf git-annex "$(OSXAPP_BASE)/git-annex-shell" ln -sf git-annex "$(OSXAPP_BASE)/git-annex-shell"
gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE gzcat standalone/licences.gz > $(OSXAPP_BASE)/LICENSE
cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt cp $(OSXAPP_BASE)/LICENSE tmp/build-dmg/LICENSE.txt
cp standalone/trustedkeys.gpg $(OSXAPP_BASE) cp standalone/trustedkeys.gpg $(OSXAPP_DEST)
./Build/Standalone $(OSXAPP_BASE) ./Build/Standalone $(OSXAPP_BASE)

3
debian/changelog vendored
View file

@ -25,6 +25,9 @@ git-annex (5.20150508.2) UNRELEASED; urgency=medium
Closes: #785498 Closes: #785498
* Safer posix fctnl locking implementation, using lock pools and STM. * Safer posix fctnl locking implementation, using lock pools and STM.
* Build documentation with TZ=UTC for reproducible builds. See #785736. * Build documentation with TZ=UTC for reproducible builds. See #785736.
* OSX: Corrected the location of trustedkeys.gpg, so the built-in
upgrade code will find it. Fixes OSX upgrade going forward, but
older versions won't upgrade themselves due to this problem.
-- Joey Hess <id@joeyh.name> Mon, 11 May 2015 12:45:06 -0400 -- Joey Hess <id@joeyh.name> Mon, 11 May 2015 12:45:06 -0400

13
doc/forum/OSX:_Upgrader:_Failed_to_check_if_upgrade_is_available./comment_1_ac7c1f39e723cbcd49d6497649e7e44f._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2015-05-22T17:35:11Z"
content="""
Aha, this is a path propel to the trustedkeys.gpg file, it's in bundle/
in the OSX app, and git-annex tells gpg to look in the parent directory
instead.
Fixed in git. Unfortunately I can't fix old versions of git-annex so
OSX users will need to manually upgrade to version 5.20150522 to get this
fix.
"""]]