08/09: accounts: Close database before renaming it.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit ed8570dce3683b73bdf668b3ad0f529a1cea30c5
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jun 5 11:12:21 2019 +0200

    accounts: Close database before renaming it.
    
    Fixes <https://bugs.gnu.org/35996>.
    Reported by Florian Pelz <address@hidden>.
    
    * gnu/build/accounts.scm (database-writer): Move 'close-port' call
    before 'rename-file'.
---
 gnu/build/accounts.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm
index 8687446..2120c1d 100644
--- a/gnu/build/accounts.scm
+++ b/gnu/build/accounts.scm
@@ -249,9 +249,11 @@ to it atomically and set the appropriate permissions."
             (lambda ()
               (chmod port mode)
               (write-entries port)
+              (close-port port)
               (rename-file template file-or-port))
             (lambda ()
-              (close-port port)
+              (unless (port-closed? port)
+                (close-port port))
               (when (file-exists? template)
                 (delete-file template))))))))