From 2a9b15aefb842a734637f3d230936ea1b7c60096 Mon Sep 17 00:00:00 2001
From: Philip Kime <Philip@kime.org.uk>
Date: Thu, 8 Nov 2018 22:02:09 +0100
Subject: [PATCH] Fix to address #239

---
 lib/Biber.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Biber.pm b/lib/Biber.pm
index 8b1f80a5..d97fca29 100644
--- a/lib/Biber.pm
+++ b/lib/Biber.pm
@@ -311,6 +311,8 @@ sub parse_ctrlfile {
     unless (eval {$checkbuf = File::Slurper::read_text($ctrl_file_path, 'latin1')}) {
       biber_error("$ctrl_file_path is not UTF-8 or even latin1, how horrible.");
     }
+    # Write ctrl file as UTF-8
+    File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
   }
 
   $checkbuf = NFD($checkbuf);# Unicode NFD boundary
@@ -319,8 +321,6 @@ sub parse_ctrlfile {
     unlink($output) unless $output eq '-';# ignore deletion of STDOUT marker
     biber_error("$ctrl_file_path is malformed, last biblatex run probably failed. Deleted $output");
   }
-  # Write ctrl file as UTF-8
-  File::Slurper::write_text($ctrl_file_path, NFC($checkbuf));# Unicode NFC boundary
 
   # Validate if asked to
   if (Biber::Config->getoption('validate_control')) {
ee506290e05a8f3869d143f'>refs</a><a class='active' href='/guix/log/gnu/build/linux-container.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/build/linux-container.scm?id=4c08aa57400424b09ee506290e05a8f3869d143f'>tree</a><a href='/guix/commit/gnu/build/linux-container.scm?id=4c08aa57400424b09ee506290e05a8f3869d143f'>commit</a><a href='/guix/diff/gnu/build/linux-container.scm?id=4c08aa57400424b09ee506290e05a8f3869d143f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/linux-container.scm'>
<input type='hidden' name='id' value='4c08aa57400424b09ee506290e05a8f3869d143f'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4c08aa57400424b09ee506290e05a8f3869d143f&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=4c08aa57400424b09ee506290e05a8f3869d143f&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/build?id=4c08aa57400424b09ee506290e05a8f3869d143f&amp;showmsg=1'>build</a>/<a href='/guix/log/gnu/build/linux-container.scm?id=4c08aa57400424b09ee506290e05a8f3869d143f&amp;showmsg=1'>linux-container.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-container.scm?id=4c08aa57400424b09ee506290e05a8f3869d143f'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-09-12 23:07:43 +0200'>2019-09-12</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-container.scm?id=d236cd16a7173278ca69578d3e7ce4d1ce55e04c'>linux-container: "run-container" scripts shows the container's PID.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/build/linux-container.scm (call-with-container): Add
 #:process-spawned-hook and honor it.
* gnu/system/linux-container.scm (container-script)[script]:
Define 'explain' and pass it as #:process-spawned-hook'.


</td></tr>
<tr class='logheader'><td><span title='2019-07-06 00:26:58 +0200'>2019-07-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-container.scm?id=935e79af61f4d903e562362cdd828be807e15581'>linux-container: Mount a new /dev/pts instance in the container.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/36463&gt;.
Reported by Steffen Rytter Postas &lt;nc@scalehost.eu&gt;.

* gnu/build/linux-container.scm (mount-file-systems): When /dev/ptmx
exists on the host, explicitly mount a new instance of devpts and make
/dev/ptmx a symlink to /dev/pts/ptmx.


</td></tr>
<tr class='logheader'><td><span title='2019-06-23 19:53:03 +0200'>2019-06-23</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-container.scm?id=40c369b23442ace588d8c85f62f1741c17ed65c0'>linux-container: Remove dependency on (guix utils).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes a bug whereby derivations importing (gnu build linux-container),
such as the 'bitlbee' and 'tor' services, would depend on the
user's (guix config) file, which was pulled as a dependency of (guix
utils).  As a result, those derivations would vary from user to user.

* gnu/build/linux-container.scm (call-with-temporary-directory): New
procedure.


</td></tr>
<tr class='logheader'><td><span title='2019-04-02 18:15:37 +0200'>2019-04-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-container.scm?id=af76c020bf19de5fe2e92f31d8b85cbd55c481de'>linux-container: Make the guest UID and GID a parameter.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/build/linux-container.scm (initialize-user-namespace): Add
 #:guest-uid and #:guest-gid parameters and honor them.
(run-container): Likewise.
(call-with-container): Likewise.
* tests/containers.scm ("call-with-container, user namespace, guest UID/GID"):
New test.


</td></tr>