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

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.

diff --git a/CHANGELOG b/CHANGELOG
index 2b6ce1626b05fed2915394f9de5e42333c1c108c..2af02734884a33c29cdb36fec886bc56dc22e580 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 

diff --git a/Makefile b/Makefile
index 04d36612fdaa9b030e367b7e827e2060d08ec04e..e2413f3c7adf32471385aa465f7b7d6b3fcf0018 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)"
        

diff --git a/doc/bugs/assistant_crashes_in_TransferScanner/comment_4_cdc659b30d1cbcfdc9ce0d311ebc52c5._comment b/doc/bugs/assistant_crashes_in_TransferScanner/comment_4_cdc659b30d1cbcfdc9ce0d311ebc52c5._comment
new file mode 100644 (file)
index 0000000..fd1be66
--- /dev/null
+++ b/doc/bugs/assistant_crashes_in_TransferScanner/comment_4_cdc659b30d1cbcfdc9ce0d311ebc52c5._comment
@@ -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.)
+"""]]