commit:     1b1725b8e9c598aae55e8f692b006856ad3107df
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 13:57:00 2026 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 13:57:00 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1b1725b8

man: unbreak generation after 62b9a5dd3e04da51bda81ce665c0d31a824971df

Make behaves like it cannot build a target when the dependency does not
exist, so after 62b9a5dd3e04da51bda81ce665c0d31a824971df we must ensure
the .desc and .optdesc.yaml files exist.  Make mkman.py deal with those
files being empty too, so the build can succeed.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 man/include/qcheck.desc           | 0
 man/include/qmerge.optdesc.yaml   | 0
 man/include/qtegrity.optdesc.yaml | 0
 man/include/qtmp.desc             | 0
 man/include/qtmp.optdesc.yaml     | 0
 man/include/qxpak.optdesc.yaml    | 0
 man/mkman.py                      | 8 ++++++--
 7 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/include/qcheck.desc b/man/include/qcheck.desc
new file mode 100644
index 00000000..e69de29b

diff --git a/man/include/qmerge.optdesc.yaml b/man/include/qmerge.optdesc.yaml
new file mode 100644
index 00000000..e69de29b

diff --git a/man/include/qtegrity.optdesc.yaml 
b/man/include/qtegrity.optdesc.yaml
new file mode 100644
index 00000000..e69de29b

diff --git a/man/include/qtmp.desc b/man/include/qtmp.desc
new file mode 100644
index 00000000..e69de29b

diff --git a/man/include/qtmp.optdesc.yaml b/man/include/qtmp.optdesc.yaml
new file mode 100644
index 00000000..e69de29b

diff --git a/man/include/qxpak.optdesc.yaml b/man/include/qxpak.optdesc.yaml
new file mode 100644
index 00000000..e69de29b

diff --git a/man/mkman.py b/man/mkman.py
index 0ebf774c..6ac1ba38 100755
--- a/man/mkman.py
+++ b/man/mkman.py
@@ -76,18 +76,22 @@ def MkMan(applets, applet, output):
     authors = COMMON_AUTHORS[:]
     see_also = sorted(['.BR %s (1)' % x for x in applets if x != applet])
 
-    description = ''
+    description = None
     desc_file = os.path.join(FRAGS_DIR, '%s.desc' % applet)
     if os.path.exists(desc_file):
         fh = open(desc_file)
         description = fh.read().rstrip()
         fh.close()
+    if not description:
+        description = ''
 
-    optdescs = []
+    optdescs = None
     desc_file = os.path.join(FRAGS_DIR, '%s.optdesc.yaml' % applet)
     if os.path.exists(desc_file):
         with open(desc_file) as fh:
             optdescs = yaml.safe_load(fh)
+    if not optdescs:
+        optdescs = []
 
     # Extract all the options
     options = []

Reply via email to