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

Linux standalone: Fix location of locale files in the bundle.

Browse source 
The Makefile was putting them in git-annex.linux/i18n/i18n, and so I18NPATH
did not point to the files. I think that on close enough to Debian systems,
localedef then fell back to using the system-wide locale files, while on
other systems it would fail to generate locales.
This commit is contained in:
Joey Hess 2016-10-31 14:31:46 -04:00
parent 752a7e765f
commit ec2e1569e6
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -2,6 +2,7 @@ git-annex (6.20161028) UNRELEASED; urgency=medium
* Assistant, repair: Fix ignoring of git fsck errors due to
duplicate file entries in tree objects.
* Linux standalone: Fix location of locale files in the bundle.
-- Joey Hess <id@joeyh.name> Mon, 31 Oct 2016 13:59:47 -0400

3
Makefile
View file

@ -144,8 +144,7 @@ linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs
install -d "$(LINUXSTANDALONE_DEST)/templates"
install -d "$(LINUXSTANDALONE_DEST)/magic"
cp /usr/share/file/magic.mgc "$(LINUXSTANDALONE_DEST)/magic"
install -d "$(LINUXSTANDALONE_DEST)/i18n"
cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)/i18n"
cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)"
./Build/LinuxMkLibs "$(LINUXSTANDALONE_DEST)"

19
doc/bugs/assistant_crashes_in_TransferScanner/comment_4_cdc659b30d1cbcfdc9ce0d311ebc52c5._comment Normal file
View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-10-31T18:16:51Z"
content="""
What is the output when using `git annex sync --content` ?
I know, same basic error as the assistant, but it probably displays
some filenames which will hint at the particular filename it's crashing on.
Investigating, it looks like there may be a recently
introduced bug in the standalone tarball where it contains
`git-annex.linux/i18n/i18n`. If you move the contents of
`git-annex.linux/i18n/i18n` to `git-annex.linux/i18n`, you might find that
it causes the crash to go away. I'm committing a fix for that problem.
(I'd still like information about the filename that causes the crash
though, since that same crash could happen if the locale was misconfigured
or if you were using a non-utf8 locale.)
"""]]