emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#41105: closed ([PATCH] build: minify-build-system: Fail to install e


From: GNU bug Tracking System
Subject: bug#41105: closed ([PATCH] build: minify-build-system: Fail to install empty files.)
Date: Mon, 18 May 2020 06:55:02 +0000

Your message dated Mon, 18 May 2020 09:54:06 +0300
with message-id <20200518065406.GC18220@E5400>
and subject line minify-build-system: Fail to install empty files
has caused the debbugs.gnu.org bug report #41105,
regarding [PATCH] build: minify-build-system: Fail to install empty files.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
41105: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41105
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH] build: minify-build-system: Fail to install empty files. Date: Wed, 6 May 2020 11:39:23 +0300
* guix/build/minify-build-system.scm (install): Produce an error if the
minified file is zero bytes.
---

I'm pretty sure this can go directly into master. 'guix refresh -l
uglify-js' shows 93 packages. 'guix refresh -l r-shiny' shows 71
packages. The 4 differing packages are hpcguix-web, calibre, mate and
snap.

My only real concern is that r-shiny is calling minify directly and so
we might want it to error during the 'build phase and not during the
'install phase.

---
 guix/build/minify-build-system.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/guix/build/minify-build-system.scm 
b/guix/build/minify-build-system.scm
index 563def88e9..92158a033f 100644
--- a/guix/build/minify-build-system.scm
+++ b/guix/build/minify-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2020 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,8 +55,12 @@
   (let* ((out (assoc-ref outputs "out"))
          (js  (string-append out "/share/javascript/")))
     (mkdir-p js)
-    (for-each (cut install-file <> js)
-              (find-files "guix/build" "\\.min\\.js$")))
+    (for-each
+      (lambda (file)
+        (if (not (zero? (stat:size (stat file))))
+          (install-file file js)
+          (error "File is empty: " file)))
+      (find-files "guix/build" "\\.min\\.js$")))
   #t)
 
 (define %standard-phases
-- 
2.26.2




--- End Message ---
--- Begin Message --- Subject: minify-build-system: Fail to install empty files Date: Mon, 18 May 2020 09:54:06 +0300
Patch pushed.

-- 
Efraim Flashner   <address@hidden>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Attachment: signature.asc
Description: PGP signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]