[libvirt PATCH 0/2] docs: fix imports of new go modules
Daniel P. Berrangé (2): docs: point go imports to gitlab.com repos docs: add go-import meta tags for new go modules docs/page.xsl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.31.1
The gitlab.com repos are the primary source, with libvirt.org just a read-only mirror. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- docs/page.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index 5cb4322fdc..8c63454902 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -100,10 +100,10 @@ <title>libvirt: <xsl:value-of select="html:html/html:body//html:h1"/></title> <meta name="description" content="libvirt, virtualization, virtualization API"/> <xsl:if test="$pagesrc = 'docs/libvirt-go.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go git https://libvirt.org/git/libvirt-go.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go git https://gitlab.com/libvirt/libvirt-go"/> </xsl:if> <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://gitlab.com/libvirt/libvirt-go-xml"/> </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> -- 2.31.1
On Fri, Jul 02, 2021 at 11:54:54AM +0100, Daniel P. Berrangé wrote:
<xsl:if test="$pagesrc = 'docs/libvirt-go.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go git https://libvirt.org/git/libvirt-go.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go git https://gitlab.com/libvirt/libvirt-go"/> </xsl:if> <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://gitlab.com/libvirt/libvirt-go-xml"/> </xsl:if>
I believe in terms of git commands it's more appropriate to use https://gitlab.com/libvirt/libvirt-go.git https://gitlab.com/libvirt/libvirt-go-xml.git but both will work due to redirects and such. So either way Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
On Fri, Jul 2, 2021 at 8:35 AM Andrea Bolognani <abologna@redhat.com> wrote:
On Fri, Jul 02, 2021 at 11:54:54AM +0100, Daniel P. Berrangé wrote:
<xsl:if test="$pagesrc = 'docs/libvirt-go.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go git https://libvirt.org/git/libvirt-go.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go git https://gitlab.com/libvirt/libvirt-go"/> </xsl:if> <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> - <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> + <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://gitlab.com/libvirt/libvirt-go-xml"/> </xsl:if>
I believe in terms of git commands it's more appropriate to use
https://gitlab.com/libvirt/libvirt-go.git https://gitlab.com/libvirt/libvirt-go-xml.git
but both will work due to redirects and such. So either way
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
The redirects have not consistently worked in the past, so I would ask that you use the .git URLs Andrea mentioned. -- 真実はいつも一つ！/ Always, there's only one truth!
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- docs/page.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/page.xsl b/docs/page.xsl index 8c63454902..2a25115171 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -105,6 +105,12 @@ <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://gitlab.com/libvirt/libvirt-go-xml"/> </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirt.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirt git https://gitlab.com/libvirt/libvirt-go-module"/> + </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirtxml.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirtxml git https://gitlab.com/libvirt/libvirt-go-xml-module"/> + </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> <script type="text/javascript" src="{$href_base}js/main.js"> -- 2.31.1
On Fri, Jul 02, 2021 at 11:54:55AM +0100, Daniel P. Berrangé wrote:
+ <xsl:if test="$pagesrc = 'docs/go/libvirt.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirt git https://gitlab.com/libvirt/libvirt-go-module"/> + </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirtxml.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirtxml git https://gitlab.com/libvirt/libvirt-go-xml-module"/> + </xsl:if>
Double space before the git URL, plus of course the same comment from the first patch applies here too. With at least the double space removed, Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Neal Gompa