From fae622c8b77feebac66a538d76e4211de8bd8eb3 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Sun, 24 Jul 2022 21:50:44 -0400
Subject: [PATCH] fix saving `AnyStyle::Dictionary` after `populate!`

Some of these fixes are more generally applicable.

A more robust solution might find data files using
e.g. `Gem.find_files()`.
---
 lib/anystyle/dictionary/gdbm.rb    |  6 ++++++
 lib/anystyle/dictionary/marshal.rb | 31 ++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/lib/anystyle/dictionary/gdbm.rb b/lib/anystyle/dictionary/gdbm.rb
index 754903c..c814df2 100644
--- a/lib/anystyle/dictionary/gdbm.rb
+++ b/lib/anystyle/dictionary/gdbm.rb
@@ -1,5 +1,6 @@
 module AnyStyle
   require 'gdbm'
+  require 'fileutils'
 
   class Dictionary
     class GDBM < Dictionary
@@ -17,8 +18,13 @@ module AnyStyle
 
       def open
         close
+        FileUtils.mkdir_p(File.dirname(options[:path]))
         @db = ::GDBM.new(*options.values_at(:path, :mode, :flags))
         self
+      rescue Errno::EACCES
+        # GDBM.new tries this if :flags is nil, but not necessarily otherwise
+        @db = ::GDBM.new(options[:path],options[:mode],::GDBM::READER)
+        self
       ensure
         populate! if empty?
       end
diff --git a/lib/anystyle/dictionary/marshal.rb b/lib/anystyle/dictionary/marshal.rb
index 761ca36..b9529d0 100644
--- a/lib/anystyle/dictionary/marshal.rb
+++ b/lib/anystyle/dictionary/marshal.rb
@@ -1,4 +1,6 @@
 module AnyStyle
+  require 'fileutils'
+  require 'tempfile'
   class Dictionary
     class Marshal < Dictionary
       @defaults = {
@@ -10,17 +12,34 @@ module AnyStyle
       end
 
       def open
-        if File.exists?(options[:path])
-          @db = ::Marshal.load(File.open(options[:path]))
-        else
-          @db = {}
+        File.open(options[:path]) do |file|
+          @db = ::Marshal.load(file)
         end
         self
+      rescue Errno::ENOENT
+        @db = {}
+        self
       ensure
         if empty?
           populate!
-          if File.writable?(options[:path])
-            ::Marshal.dump(db, File.open(options[:path], 'wb'))
+          tmp = nil
+          begin
+            FileUtils.mkdir_p(File.dirname(options[:path]))
+            tmp = Tempfile.create(File.basename(options[:path]),
+                                  File.dirname(options[:path]),
+                                  mode: File::Constants::BINARY)
+            pth = tmp.path()
+            ::Marshal.dump(db, tmp)
+            tmp.close()
+            File.rename(tmp.path, options[:path]) # will overwrite if exists
+            tmp = nil
+          rescue SystemCallError => e
+            warn(e.message)
+          ensure
+            if tmp then
+              tmp.close()
+              tmp.unlink()
+            end
           end
         end
       end
-- 
2.32.0

'2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=635d49f97ee233bbb2673f97d7556c3c91b55889'>packages: Use SRFI-71 instead of SRFI-11.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (%package-module-path): Use 'let*' instead of
'let*-values'.
(specification-&gt;package, specification-&gt;location)
(specification-&gt;package+output): Use 'let' instead of 'let-values'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=7041fe0646a9603e7d1d6bde139a284146515917'>packages: Add 'specifications-&gt;packages'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (specifications-&gt;packages): New procedure.
* guix/scripts/home/import.scm (manifest+configuration-files-&gt;code): Use it.
* tests/home-import.scm (match-home-environment-no-services)
(match-home-environment-no-services-nor-packages)
(match-home-environment-bash-service)
(match-home-environment-bash-service-with-alias): Adjust 'packages'
field accordingly.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Antero Mejr</td></tr>
<tr><td><span title='2022-04-04 22:58:03 +0200'>2022-04-04</span></td><td><a href='/guix/commit/gnu/packages.scm?id=f54f2aa9df5047b348ca104f5145af50c1a482f6'>packages: Add 'package-unique-version-prefix'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (package-unique-version-prefix): New procedure.
* guix/scripts/package.scm (manifest-entry-version-prefix): Use it.
* tests/packages.scm ("package-unique-version-prefix, gcc@8")
("package-unique-version-prefix, grep"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-11 20:34:59 +0100'>2022-01-11</span></td><td><a href='/guix/commit/gnu/packages.scm?id=0552dcb294bbfed76d7a495f5e368c53f20b852a'>shell: Cache profiles even when using package specs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This enables profile caching not just when '-m' or '-f' is used, but
also when package specs are passed on the command line, as in:

  guix shell -D guix git

It also changes profile cache keys to include the system type, which was
previously ignored.

* guix/scripts/shell.scm (options-with-caching)[single-file-for-caching]:
Remove.
Call 'profile-cached-gc-root' instead; adjust to accept two values.
(profile-cache-primary-key): New procedure.
(profile-cache-key): Remove.
(profile-file-cache-key, profile-spec-cache-key): New procedures.
(profile-cached-gc-root): Rewrite to include functionality formally in
'single-file-for-caching', but extend to handle package specs.
* gnu/packages.scm (cache-is-authoritative?): Export.
* guix/transformations.scm (transformation-option-key?): New procedure.
* doc/guix.texi (Invoking guix shell): Move '--rebuild-cache'
documentation to the bottom, just above '--root'.  Explain caching and
how these two options relate to that.
</span></span></td><td>Ludovic Courtès</td></tr>