Bug 253192 - release.sh: Skip installing textproc/docproj when NODOC is set
Summary: release.sh: Skip installing textproc/docproj when NODOC is set
Status: Closed Not A Bug
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Only Me
Assignee: Glen Barber
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-02-02 23:38 UTC by Yasuhiro Kimura
Modified: 2021-04-29 15:33 UTC (History)
1 user (show)

See Also:


Attachments
Patch file (449 bytes, patch)
2021-02-02 23:38 UTC, Yasuhiro Kimura
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura 2021-02-02 23:38:45 UTC
Created attachment 222098 [details]
Patch file

textproc/docproj is installed to create release documents from doc source tree. But if NODOC is set neither doc source tree is checked out nor release documents are created. As a result installed package isn't used at all. So skip installing it when NODOC is set.
Comment 1 Glen Barber freebsd_committer 2021-02-03 00:02:47 UTC
This shouldn't be needed.

180         if [ -n "${NODOC}" ]; then
181                 SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NODOC=yes"
182         fi

Did you encounter a case where NODOC did not properly get set?  I will commit it regardless, as I see no harm in doing so.
Comment 2 commit-hook freebsd_committer 2021-02-03 00:04:51 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=805e2876ec20f89e45f0f9f4164f31b6711ff0ea

commit 805e2876ec20f89e45f0f9f4164f31b6711ff0ea
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 00:04:11 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-02-03 00:04:11 +0000

    release.sh: Skip installing textproc/docproj when NODOC is set

    PR:             253192
    Submitted by:   Yasuhiro Kimura
    MFC after:      3 days
    Sponsored by:   Rubicon Communications, LLC ("Netgate")

 release/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 3 Yasuhiro Kimura 2021-02-03 00:08:26 UTC
(In reply to Glen Barber from comment #1)

Hmm I may have made something wrong. I'll double check without this change.
Comment 4 Yasuhiro Kimura 2021-02-03 14:51:21 UTC
(In reply to Yasuhiro Kimura from comment #3)

I tried again and everything worked as is expected without this change. Sorry for bothering you.
Comment 5 commit-hook freebsd_committer 2021-04-29 15:33:10 UTC
A commit in branch stable/13 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=5950b9cdbba29ebd1b33be9e52cd9d26d732481b

commit 5950b9cdbba29ebd1b33be9e52cd9d26d732481b
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-03 00:04:11 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-04-29 15:24:03 +0000

    release.sh: Skip installing textproc/docproj when NODOC is set

    PR:             253192
    Submitted by:   Yasuhiro Kimura
    Sponsored by:   Rubicon Communications, LLC ("Netgate")

    (cherry picked from commit 805e2876ec20f89e45f0f9f4164f31b6711ff0ea)

 release/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)