Author: Antero Mejr <antero@mailbox.org>
Upstream status: I didn't report upstream because they don't have an issue tracker and
PRs require signing the Google CLA. If someone willing to sign the CLA
wants to submit the patch, please go ahead.

diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
index 021cf5c8..5948e140 100644
--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc
+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc
@@ -88,6 +88,7 @@ class DirEntry {

   const std::string& name() const { return name_; }
   DirEntryKinds kind() const { return kind_; }
+  bool operator<(const DirEntry& d) { return name_ < d.name(); }
 
  private:
   std::string name_;
@@ -115,6 +116,7 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) {
     errno = 0;
     entry = readdir(dir);
     if (entry == NULL) {
+      std::sort(entries->begin(), entries->end());
       return errno == 0;
     }
     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=3adde132c90bf41558460c150be32d3accfcf325'>refs</a><a class='active' href='/guix/log/tests/guix-archive.sh?showmsg=1'>log</a><a href='/guix/tree/tests/guix-archive.sh?id=3adde132c90bf41558460c150be32d3accfcf325'>tree</a><a href='/guix/commit/tests/guix-archive.sh?id=3adde132c90bf41558460c150be32d3accfcf325'>commit</a><a href='/guix/diff/tests/guix-archive.sh?id=3adde132c90bf41558460c150be32d3accfcf325'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-archive.sh'>
<input type='hidden' name='id' value='3adde132c90bf41558460c150be32d3accfcf325'/><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=3adde132c90bf41558460c150be32d3accfcf325&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=3adde132c90bf41558460c150be32d3accfcf325&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/guix-archive.sh?id=3adde132c90bf41558460c150be32d3accfcf325&amp;showmsg=1'>guix-archive.sh</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/tests/guix-archive.sh?id=3adde132c90bf41558460c150be32d3accfcf325'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-archive.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a></td><td>Eric Bavier</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>