From nobody Sun Apr 28 06:45:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596556394; cv=none; d=zohomail.com; s=zohoarc; b=eKD1TebISWKGjOCMRYKjoGGxuMjUId9VJc1tzQGcunuNxPR+ye7GVTZ/SoKYx5EVklS9KlluSnxCpXyxHBss7Vtdzy3ovBjdd9pbVzFYMv45LpSC0qKeo3EBctHhXy4tppOzuLzgIX2MBtt0yjRbB6vz+JYrw2zrMyx5aBJ1wAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596556394; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=2BZx3mIsi6WHappR9QhpiA1eP41aSC0/VoLfTaEEzPk=; b=Dmx2bmusG2QNnJOft6ge/22l4zjSTC/dcHBMs45rkvxDhuxQIwTUQqiIwXEO9UwVK5pc6GXreX6B271FIZuMUGyThLqY1O4yYWnpVNP6ZeR3izDgyZ5upzX7yCQpng/0zFzHtoXQ/J96hD9XAlyCXgdJF02Sxe9xobjtxu30+R8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1596556394592527.5332093216692; Tue, 4 Aug 2020 08:53:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-12RbTUSuMJWivEd9FIF4Sg-1; Tue, 04 Aug 2020 11:53:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C88E80BCAF; Tue, 4 Aug 2020 15:53:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F1441002391; Tue, 4 Aug 2020 15:53:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 958651809554; Tue, 4 Aug 2020 15:53:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 074Fr2HY023594 for ; Tue, 4 Aug 2020 11:53:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 725D25DA76; Tue, 4 Aug 2020 15:53:02 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1CE55DA33; Tue, 4 Aug 2020 15:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596556393; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2BZx3mIsi6WHappR9QhpiA1eP41aSC0/VoLfTaEEzPk=; b=a5D8+2i0KqutFw8lxM58kC/JeiKcEW5qD8IH3HH1pNfA1oSVexOTMrZQ5SB92kL8xphSQk SgKKh/mo03uzNODBoBoMVo16wAxtb6atATVckA+qWEPIJTFk//nNYqjm50oFr5MsK9DIIF xfAhFXVrZde8G4H9zT2xFHJo4Cw4eS0= X-MC-Unique: 12RbTUSuMJWivEd9FIF4Sg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH] docs: fix libvirt go-import metadata in pages Date: Tue, 4 Aug 2020 16:52:56 +0100 Message-Id: <20200804155256.4099540-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The meson conversion lost the tags providing the go-import, because the "$pagename" variable lost the .html suffix. Rather than fix that, just change to using "$pagesrc" instead, as it is a better fit. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- docs/newapi.xsl | 2 -- docs/page.xsl | 7 +++---- docs/site.xsl | 3 +-- docs/subsite.xsl | 1 - scripts/meson-html-gen.py | 4 ---- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 0dc4f7ae52..7ac8caa35d 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -835,7 +835,6 @@ indent=3D"yes" encoding=3D"UTF-8"> - @@ -851,7 +850,6 @@ indent=3D"yes" encoding=3D"UTF-8"> - diff --git a/docs/page.xsl b/docs/page.xsl index bdd57ba2e0..9ab8d3dd69 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -76,14 +76,13 @@ =20 - <!DOCTYPE html> - This file is autogenerated from .in + This file is autogenerated from Do not edit this file. Changes will be lost. @@ -100,10 +99,10 @@ libvirt: <xsl:value-of select=3D"html:html/html:body//html:= h1"/> - + - + diff --git a/docs/site.xsl b/docs/site.xsl index 73ddd8ca6b..931e26272f 100644 --- a/docs/site.xsl +++ b/docs/site.xsl @@ -15,7 +15,7 @@ =20 - + @@ -26,7 +26,6 @@ =20 - diff --git a/docs/subsite.xsl b/docs/subsite.xsl index bfd34eebd2..2bdfcbb9b1 100644 --- a/docs/subsite.xsl +++ b/docs/subsite.xsl @@ -16,7 +16,6 @@ =20 - diff --git a/scripts/meson-html-gen.py b/scripts/meson-html-gen.py index dbf238de54..2731d734a7 100755 --- a/scripts/meson-html-gen.py +++ b/scripts/meson-html-gen.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 =20 import argparse -import os import subprocess =20 parser =3D argparse.ArgumentParser() @@ -15,12 +14,9 @@ parser.add_argument("htmlfile", type=3Dstr, help=3D"path= to generated HTML file") parser.add_argument("pagesrc", type=3Dstr, default=3D"", nargs=3D'?', help= =3D"(optional) path to source file used for edit this page") args =3D parser.parse_args() =20 -name =3D os.path.basename(args.htmlfile).replace('.html', '') - html_tmp =3D subprocess.run( [ args.xsltproc, - '--stringparam', 'pagename', name, '--stringparam', 'pagesrc', args.pagesrc, '--stringparam', 'builddir', args.builddir, '--stringparam', 'timestamp', args.timestamp, --=20 2.26.2