qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Krempa <pkrempa@redhat.com>, qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>
Subject: Re: [PATCH v2 1/2] tests: libvirt-ci: Update to commit '51dad419'
Date: Tue, 18 Apr 2023 11:05:58 +0200	[thread overview]
Message-ID: <163e0935-73d1-12bd-7868-c70c5fe563f6@redhat.com> (raw)
In-Reply-To: <bd11b5954d3dd1e989699370af2b9e2e0c77194a.1681735482.git.pkrempa@redhat.com>

On 4/17/23 14:46, Peter Krempa wrote:
> Update to commit which has fixes needed for OpenSUSE 15.4 and
> re-generate output files.
> 
> Signed-off-by: Peter Krempa<pkrempa@redhat.com>
> ---
>   .gitlab-ci.d/cirrus/freebsd-12.vars           |  16 ++
>   .gitlab-ci.d/cirrus/freebsd-13.vars           |  16 ++
>   .gitlab-ci.d/cirrus/macos-12.vars             |  16 ++
>   tests/docker/dockerfiles/alpine.docker        | 127 +++++++++++++

Oops, I missed that '51dad419' is buggy and the next commit (2fa24dce8b) is
needed instead:

     commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95
     Author: Erik Skultety <eskultet@redhat.com>
     Date:   Wed Apr 5 15:43:55 2023 +0200

     lcitool: __main__: Prevent running main() on import
     
     When commit f0cc11e3f introduced the module, it did it so that:
     1) it complies with PEP 517 [1]
     2) lcitool could be executed as a Python module
     
     The implementation is based on having a __main__.py module which Python
     can automatically import. The problem is that when the main function is
     imported from the module from within the automatic executable wrapper
     created when the package is installed, it executes the whole module on
     import (standard behaviour). At the end of the module there's an
     unguarded call to the main() function.
     Fix this with the '__name__ == "__main__"' idiom.
     
     Fixes: f0cc11e3f
     
     [1] https://peps.python.org/pep-0517/
     
     Signed-off-by: Erik Skultety <eskultet@redhat.com>

I adjusted the submodule and rerun tests/lcitool/refresh.

Paolo



  reply	other threads:[~2023-04-18  9:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-17 12:46 [PATCH v2 0/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Peter Krempa
2023-04-17 12:46 ` [PATCH v2 1/2] tests: libvirt-ci: Update to commit '51dad419' Peter Krempa
2023-04-18  9:05   ` Paolo Bonzini [this message]
2023-04-18  9:15   ` Daniel P. Berrangé
2023-04-17 12:46 ` [PATCH v2 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Peter Krempa
2023-04-17 14:32   ` Olaf Hering
2023-04-18  9:05     ` Paolo Bonzini
2023-04-18  9:40     ` Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=163e0935-73d1-12bd-7868-c70c5fe563f6@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=bleal@redhat.com \
    --cc=philmd@linaro.org \
    --cc=pkrempa@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).