From nobody Wed May 14 06:52:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921627153187.36387662113964; Mon, 21 May 2018 09:53:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB814350076; Mon, 21 May 2018 16:53:45 +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 81FA3177A7; Mon, 21 May 2018 16:53:45 +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 34A3E180B5AA; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrchn003900 for ; Mon, 21 May 2018 12:53:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D705215CDAC; Mon, 21 May 2018 16:53:38 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CCF1215CDA7 for ; Mon, 21 May 2018 16:53:37 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:26 +0200 Message-Id: <20180521165327.22427-5-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 4/5] guests: Make PYTHONPATH dynamic 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 May 2018 16:53:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of having to specify this separately for every guest due to minor differences in the environment, figure it out at login time by asking Python itself for the information we need. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/group_vars/all/main.yml | 1 - guests/host_vars/libvirt-centos-6/main.yml | 2 -- guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/host_vars/libvirt-debian-8/main.yml | 2 -- guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-debian-sid/main.yml | 2 -- guests/host_vars/libvirt-fedora-27/main.yml | 2 -- guests/host_vars/libvirt-fedora-28/main.yml | 2 -- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 -- guests/host_vars/libvirt-freebsd-10/main.yml | 2 -- guests/host_vars/libvirt-freebsd-11/main.yml | 2 -- guests/host_vars/libvirt-freebsd-current/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-14/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 2 -- guests/host_vars/libvirt-ubuntu-18/main.yml | 2 -- guests/templates/bashrc.j2 | 10 +++++++++- 16 files changed, 9 insertions(+), 30 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 840c80b..2641c33 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -16,4 +16,3 @@ PKG_CONFIG_PATH: $VIRT_PREFIX/lib/pkgconfig XDG_DATA_DIRS: $VIRT_PREFIX/share:/usr/share:/usr/local/share GI_TYPELIB_PATH: $VIRT_PREFIX/lib/girepository-1.0 OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo -PYTHONPATH: diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/= libvirt-centos-6/main.yml index c27c1ad..265c622 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,5 +1,3 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages - projects: - libvirt+website diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 6cb8995..c147830 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/= libvirt-debian-8/main.yml index 64f3255..954a037 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/= libvirt-debian-9/main.yml index 04d5132..a588c09 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_var= s/libvirt-debian-sid/main.yml index cbf57aa..a588c09 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars= /libvirt-fedora-27/main.yml index 9ed392b..00b0848 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars= /libvirt-fedora-28/main.yml index 9ed392b..00b0848 100644 --- a/guests/host_vars/libvirt-fedora-28/main.yml +++ b/guests/host_vars/libvirt-fedora-28/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host= _vars/libvirt-fedora-rawhide/main.yml index 91b4158..5044594 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libosinfo+mingw diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_var= s/libvirt-freebsd-10/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/libvirt-freebsd-11/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_vars/libvirt-freebsd-current/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars= /libvirt-ubuntu-14/main.yml index bfbdda6..839c668 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-16/main.yml index 04d5132..a588c09 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars= /libvirt-ubuntu-18/main.yml index cbf57aa..a588c09 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/templates/bashrc.j2 b/guests/templates/bashrc.j2 index cf2679e..a4183ff 100644 --- a/guests/templates/bashrc.j2 +++ b/guests/templates/bashrc.j2 @@ -8,7 +8,6 @@ export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" -export PYTHONPATH=3D"{{ PYTHONPATH }}" =20 export MAKE=3D"{{ make }}" export PYTHON=3D"{{ python }}" @@ -18,6 +17,15 @@ export PYTHON=3D"{{ python }}" plarch=3D$(perl -e 'use Config; print $Config{archname}') export PERL5LIB=3D"$VIRT_PREFIX/lib/perl5/$plarch" =20 +# For Python we need the version number (major and minor) and +# to know whether "lib64" paths are searched +pylib=3Dlib +if $PYTHON -c 'import sys; print("\n".join(sys.path))' | grep -q lib64; th= en + pylib=3Dlib64 +fi +pyver=3D$($PYTHON -c 'import sys; print(".".join(map(lambda x: str(sys.ver= sion_info[x]), [0,1])))') +export PYTHONPATH=3D"$VIRT_PREFIX/$pylib/python$pyver/site-packages" + # Enable bash completion. Only needed on FreeBSD, the system-wide # shell profile will take care of it for us everywhere else bash_completion=3D/usr/local/share/bash-completion/bash_completion.sh --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list