[PATCH] import: texlive: Check if Subversion is installed.

Open

Details

4 participants

Liliana Marie Prikler
Xinglu Chen
yarl baudig
zimoun

Owner: unassigned

Submitted by: Xinglu Chen

Severity: normal

Xinglu Chen wrote on 22 Dec 2021 10:01

Recipients:(address . guix-patches@gnu.org)

Message-ID:132d0f25d38be2a34abec3c43e4d685cdd0abe65.1640163645.git.public@yoctocell.xyz

Exit with a friendlier error message instead of throwing throwing a “failed with

signal 11” error if ‘svn’ isn’t in the user’s PATH.

$ guix import texlive getmap

command "svn" "export" "--non-interactive" "--trust-server-cert" "-r" "59745" "svn://www.tug.org/texlive/tags/texlive-2021.3/Master/texmf-dist/doc/latex/getmap/" "/tmp/guix-directory.YgfGgo/doc/latex/getmap/" failed with signal 11

* doc/guix.texi (Invoking guix import): Mention that Subversion has be

installed.

* guix/import/texlive.scm (tlpdb->package): Check if ‘svn’ is found in PATH,

if not exit with an error message.

---

doc/guix.texi | 4 +++-

guix/import/texlive.scm | 7 +++++++

2 files changed, 10 insertions(+), 1 deletion(-)

Toggle diff (51 lines)diff --git a/doc/guix.texi b/doc/guix.texi
index 333cb4117a..1ece51de81 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12020,7 +12020,9 @@
 Information about the package is obtained from the TeX Live package
 database, a plain text file that is included in the @code{texlive-bin}
 package.  The source code is downloaded from possibly multiple locations
-in the SVN repository of the Tex Live project.
+in the SVN repository of the Tex Live project.  This means that the
+@code{subversion} package has to be installed in order for the importer
+to work.
 
 The command command below imports metadata for the @code{fontspec}
 TeX package:
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index bdef9f58b0..e3b870efa0 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,8 @@ (define-module (guix import texlive)
   #:use-module (guix utils)
   #:use-module (guix upstream)
   #:use-module (guix packages)
+  #:use-module (guix diagnostics)
+  #:use-module (guix i18n)
   #:use-module (guix build-system texlive)
   #:export (texlive->guix-package
             texlive-recursive-import))
@@ -204,6 +207,10 @@ (define (files->directories files)
                           equal?)))
 
 (define (tlpdb->package name package-database)
+  ;; Check if 'svn' is available.
+  (unless (search-path (string-split (getenv "PATH") #\:) "svn")
+    (leave (G_ "the 'svn' program has to be in your PATH~%")))
+  
   (and-let* ((data (assoc-ref package-database name))
              (dirs (files->directories
                     (map (lambda (dir)

base-commit: 87e5502d406bfb44b61f7577b241602e02a3498e
-- 
2.33.1

Liliana Marie Prikler wrote on 22 Dec 2021 12:50

Recipients:

Message-ID:62f7af317db40e543c8e329ccf86849cda08eca4.camel@ist.tugraz.at

Am Mittwoch, dem 22.12.2021 um 10:01 +0100 schrieb Xinglu Chen:

Toggle quote (11 lines)> Exit with a friendlier error message instead of throwing throwing a
> “failed with
> signal 11” error if ‘svn’ isn’t in the user’s PATH.
> 
> � $ guix import texlive getmap
> � command "svn" "export" "--non-interactive" "--trust-server-cert" "-
> r" "59745"
> "svn://
> www.tug.org/texlive/tags/texlive-2021.3/Master/texmf-dist/doc/latex/getmap/
> " "/tmp/guix-directory.YgfGgo/doc/latex/getmap/" failed with signal
> 11

Shouldn't we use a guix-built svn here (as in svn-fetch)?

Xinglu Chen wrote on 22 Dec 2021 14:42

Recipients:

Message-ID:87a6gswyb4.fsf@yoctocell.xyz

Am Mittwoch, der 22. Dezember 2021, um 12:50 +01, schrieb Liliana Marie Prikler:

Toggle quote (14 lines)> Am Mittwoch, dem 22.12.2021 um 10:01 +0100 schrieb Xinglu Chen:
>> Exit with a friendlier error message instead of throwing throwing a
>> “failed with
>> signal 11” error if ‘svn’ isn’t in the user’s PATH.
>> 
>> � $ guix import texlive getmap
>> � command "svn" "export" "--non-interactive" "--trust-server-cert" "-
>> r" "59745"
>> "svn://
>> www.tug.org/texlive/tags/texlive-2021.3/Master/texmf-dist/doc/latex/getmap/
>> " "/tmp/guix-directory.YgfGgo/doc/latex/getmap/" failed with signal
>> 11
> Shouldn't we use a guix-built svn here (as in svn-fetch)?

Which ‘svn-fetch’ are you referring to (there are two AFAICS)?  The
Texlive importer uses ‘download-multi-svn-to-store’, which itself uses
‘svn-fetch’ from (guix build svn), but it requires the ‘svn’ program to
be in PATH.

There is another ‘svn-fetch’ procedure, in (guix svn-download), but that
one returns a fixed-output derivation, so it can only be used if we
already know the hash (which we don’t, that’s why we are fetching the
SVN repo).

Importers that fetch a Git repo don’t need ‘git’ to be in PATH since
they use the Guile-Git bindings to libgit2.  But we don’t have Guile
bindings to SVN (or Hg, CVS, Bzr), so the program has to be installed on
the host system.

zimoun wrote on 22 Dec 2021 15:23

Re: [bug#52731] [PATCH] import: texlive: Check if Subversion is installed.

Recipients:

Message-ID:867dbwsop1.fsf@gmail.com

Hi,

Your patch is an improvement considering this old discussion [1].

1: https://issues.guix.gnu.org/issue/28303#5

On Wed, 22 Dec 2021 at 14:42, Xinglu Chen <public@yoctocell.xyz> wrote:

Toggle quote (10 lines)> Which ‘svn-fetch’ are you referring to (there are two AFAICS)?  The
> Texlive importer uses ‘download-multi-svn-to-store’, which itself uses
> ‘svn-fetch’ from (guix build svn), but it requires the ‘svn’ program to
> be in PATH.
>
> There is another ‘svn-fetch’ procedure, in (guix svn-download), but that
> one returns a fixed-output derivation, so it can only be used if we
> already know the hash (which we don’t, that’s why we are fetching the
> SVN repo).

The one in (guix svn-download) uses under the hood (guix build svn), if

I read correctly:

Toggle snippet (11 lines)      #~(begin
          (use-modules (guix build svn))
          (svn-fetch '#$(svn-reference-url ref)
                     '#$(svn-reference-revision ref)
                     #$output
                     #:svn-command (string-append #+svn "/bin/svn")
                     #:recursive? #$(svn-reference-recursive? ref)
                     #:user-name #$(svn-reference-user-name ref)
                     #:password #$(svn-reference-password ref)))))

Anyway. :-)

Toggle quote (5 lines)

> Importers that fetch a Git repo don’t need ‘git’ to be in PATH since

> they use the Guile-Git bindings to libgit2. But we don’t have Guile

> bindings to SVN (or Hg, CVS, Bzr), so the program has to be installed on

> the host system.

I think it is not related how the call is done, here (invoke “svn”

“export” …) and not (libsvn-export …).

In the snippet above, #+svn is transparently picked from the current

subversion package. Maybe the bit

Toggle snippet (6 lines)

(define (subversion-package)

"Return the default Subversion package."

(let ((distro (resolve-interface '(gnu packages version-control))))

(module-ref distro 'subversion)))

could go to ’(guix build svn)’, used overthere instead of “#:key

(svn-command "svn")”; and maybe exported if needed.

WDYT?

1: https://issues.guix.gnu.org/issue/28303#5

Cheers,

simon

Xinglu Chen wrote on 22 Dec 2021 16:21

Recipients:

Message-ID:8735mkwtpu.fsf@yoctocell.xyz

Hi,

zimoun schrieb am Mittwoch der 22. Dezember 2021 um 15:23 +01:

Toggle quote (6 lines)

> Hi,

> Your patch is an improvement considering this old discussion [1].

> 1: <https://issues.guix.gnu.org/issue/28303#5>

Oh, looks like this has been a problem for a while, and I suspect that

it was the root cause of [1] too.

[1]: https://yhetil.org/guix/87im0do5iq.fsf@yoctocell.xyz

Toggle quote (37 lines)> On Wed, 22 Dec 2021 at 14:42, Xinglu Chen <public@yoctocell.xyz> wrote:
>
>> Which ‘svn-fetch’ are you referring to (there are two AFAICS)?  The
>> Texlive importer uses ‘download-multi-svn-to-store’, which itself uses
>> ‘svn-fetch’ from (guix build svn), but it requires the ‘svn’ program to
>> be in PATH.
>>
>> There is another ‘svn-fetch’ procedure, in (guix svn-download), but that
>> one returns a fixed-output derivation, so it can only be used if we
>> already know the hash (which we don’t, that’s why we are fetching the
>> SVN repo).
>
> The one in (guix svn-download) uses under the hood (guix build svn), if
> I read correctly:
>
> --8<---------------cut here---------------start------------->8---
>       #~(begin
>           (use-modules (guix build svn))
>           (svn-fetch '#$(svn-reference-url ref)
>                      '#$(svn-reference-revision ref)
>                      #$output
>                      #:svn-command (string-append #+svn "/bin/svn")
>                      #:recursive? #$(svn-reference-recursive? ref)
>                      #:user-name #$(svn-reference-user-name ref)
>                      #:password #$(svn-reference-password ref)))))
> --8<---------------cut here---------------end--------------->8---
>
> Anyway. :-)
>
>> Importers that fetch a Git repo don’t need ‘git’ to be in PATH since
>> they use the Guile-Git bindings to libgit2.  But we don’t have Guile
>> bindings to SVN (or Hg, CVS, Bzr), so the program has to be installed on
>> the host system.
>
> I think it is not related how the call is done, here (invoke “svn”
> “export” …) and not (libsvn-export …).

My point was that because we don’t have Guile bindings to any VCS except

Git, the user needs to have the corresponding VCS program installed in

order for the importer to fetch the repo.

Toggle quote (15 lines)> In the snippet above, #+svn is transparently picked from the current
> subversion package.  Maybe the bit
>
> --8<---------------cut here---------------start------------->8---
> (define (subversion-package)
>   "Return the default Subversion package."
>   (let ((distro (resolve-interface '(gnu packages version-control))))
>     (module-ref distro 'subversion)))
> --8<---------------cut here---------------end--------------->8---
>
> could go to ’(guix build svn)’, used overthere instead of “#:key
> (svn-command "svn")”; and maybe exported if needed.
>
> WDYT?

Sure, that sounds like a nice refactoring. It seems to apply to the

other VCSs too. :-)

yarl baudig wrote on 17 Nov 2022 14:10

(no subject)

Recipients:(address . 52731@debbugs.gnu.org)

Message-ID:ea-mime-637632a9-350-b5b49e0@www.mailo.com

May I raise back this issue as I lost some time understanding why I couldn't "guix import texlive ...". All I needed was subversion installed. Can this be at least documented in the manual please?

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 52731@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 52731

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date