ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

man-db: Correctly resolve man page links.

Browse source 
Fixes <https://issues.guix.gnu.org/73259>.

Fixes a bug introduced in 8224555802
whereby a link such as “.so man1/bzdiff.1” would resolve to the file
that contains the link (in this case ‘bzcmp.1.zst’), as opposed to the
actual link target.  As a result, ‘man-page->entry’ would recurse,
reopening the man page that contains the link until file descriptor
exhaustion.

* guix/man-db.scm (mandb-entries): In second argument to
‘man-page->entry’, return either FILE-GZ or FILE-ZST, but not FILE.

Change-Id: I06a7a6905a98524efc889a18e81352bf9eec5743
This commit is contained in:
Ludovic Courtès 2024-09-30 11:18:03 +02:00
parent d057d59170
commit 210bbf9a39
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
guix/man-db.scm
View file

@ -223,7 +223,6 @@ (define (mandb-entries directory)
".gz"))
(file-zst (string-append directory "/" link
".zst")))
(and (or (file-exists? file-gz)
(file-exists? file-zst) file)
file)))))
(or (and (file-exists? file-gz) file-gz)
(and (file-exists? file-zst) file-zst))))))
(man-files directory)))