GNU bug report logs - #31755
[PATCH 00/19] Use (guix store database) instead of 'guix-register'

Previous Next

Full log

Message #38 received at 31755 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 31755 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 11/19] database: 'reset-timestamps' sets file permissions as
 well.
Date: Fri,  8 Jun 2018 11:34:43 +0200

* guix/store/database.scm (reset-timestamps): Add 'chmod' calls.
---
 guix/store/database.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/guix/store/database.scm b/guix/store/database.scm
index 094dea3ec..67dfb8b0e 100644
--- a/guix/store/database.scm
+++ b/guix/store/database.scm
@@ -24,7 +24,8 @@
   #:use-module (guix store deduplication)
   #:use-module (guix base16)
   #:use-module (guix build syscalls)
-  #:use-module ((guix build utils) #:select (mkdir-p))
+  #:use-module ((guix build utils)
+                #:select (mkdir-p executable-file?))
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-19)
@@ -189,11 +190,12 @@ Every store item in REFERENCES must already be registered."
 ;; TODO: Factorize with that in (gnu build install).
 (define (reset-timestamps file)
   "Reset the modification time on FILE and on all the files it contains, if
-it's a directory."
+it's a directory.  While at it, canonicalize file permissions."
   (let loop ((file file)
              (type (stat:type (lstat file))))
     (case type
       ((directory)
+       (chmod file #o555)
        (utime file 0 0 0 0)
        (let ((parent file))
          (for-each (match-lambda
@@ -212,16 +214,9 @@ it's a directory."
        ;; symlinks.
        #f)
       (else
+       (chmod file (if (executable-file? file) #o555 #o444))
        (utime file 0 0 0 0)))))
 
-;; TODO: make this canonicalize store items that are registered. This involves
-;; setting permissions and timestamps, I think. Also, run a "deduplication
-;; pass", whatever that involves. Also, handle databases not existing yet
-;; (what should the default behavior be?  Figuring out how the C++ stuff
-;; currently does it sounds like a lot of grepping for global
-;; variables...). Also, return #t on success like the documentation says we
-;; should.
-
 (define* (register-path path
                         #:key (references '()) deriver prefix
                         state-directory (deduplicate? #t)
-- 
2.17.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.