Hello Mark, Mark H Weaver <m...@netris.org> writes:
[…] > go.wig...@gmail.com (Oleg Pykhalov) writes: > >> wigust pushed a commit to branch core-updates >> in repository guix. >> >> commit f037673c3133ae7453794f1f62eecebf9d06b092 >> Author: Oleg Pykhalov <go.wig...@gmail.com> >> Date: Tue May 22 07:41:45 2018 +0300 >> >> gnu: cmake: Delete Emacs library. >> >> * gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library. […] > Also, the commit log is wrong (it says that the changes were in > finance.scm), and: Ouch, I'm sorry. >> @@ -85,6 +85,12 @@ >> " --exclude-regex ^\\(" (string-join skipped-tests "\\|") >> "\\)$"))) >> #:phases >> (modify-phases %standard-phases >> + (add-after 'unpack 'split-package >> + ;; Remove files that have been packaged in other package recipes. >> + (lambda _ >> + (delete-file "Auxiliary/cmake-mode.el") >> + (substitute* "Auxiliary/CMakeLists.txt" >> + ((".*cmake-mode.el.*") "")))) > > this new phase that you've added returns an unspecified value, although > it is supposed to return a boolean to indicate success or failure. substitute* returns #t if it finds a file and error otherwise. Do I miss understand something? --8<---------------cut here---------------start------------->8--- scheme@(guile-user)> (substitute* "/tmp/test.txt" (("Hello") "foo")) $3 = #t scheme@(guile-user)> (substitute* "/tmp/test.txt" (("bla") "foo")) $4 = #t scheme@(guile-user)> (substitute* "/tmp/test.txtf" (("bla") "foo")) ERROR: In procedure stat: In procedure stat: No such file or directory: "/tmp/test.txtf" Entering a new prompt. Type `,bt' for a backtrace or `,q' to continue. --8<---------------cut here---------------end--------------->8--- /tmp/test.txt --8<---------------cut here---------------start------------->8--- Hello --8<---------------cut here---------------end--------------->8--- […] > After fixing the commit log and return value of the new phase, how > about pushing this to 'core-updates-next' instead? OK, I'll do it later. > What do you think? core-updates-next branch should be mentioned in Guix documentation https://www.gnu.org/software/guix/manual/html_node/Submitting-Patches.html Oleg.
signature.asc
Description: PGP signature