From Dan Kenigsberg <[email protected]>: Dan Kenigsberg has uploaded a new change for review.
Change subject: move dsaversion to common ...................................................................... move dsaversion to common dsaversion is used by infra and network subsystems, and should thus be shipped in common. Change-Id: I687bf30db22fe43f685d89dab09a7e0abdd82db6 Signed-off-by: Dan Kenigsberg <[email protected]> --- M .gitignore M lib/vdsm/Makefile.am M lib/vdsm/common/Makefile.am R lib/vdsm/common/dsaversion.py.in M lib/vdsm/host/caps.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/vdsmd.py M vdsm.spec.in 8 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/80954/1 diff --git a/.gitignore b/.gitignore index 7e8c362..f004f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,7 @@ lib/vdsm/api/vdsm-api.html lib/vdsm/common/constants.py lib/vdsm/common/config.py -lib/vdsm/dsaversion.py +lib/vdsm/common/dsaversion.py lib/sos/vdsm.py lib/vdsm/storage/lvm.env lib/vdsm/storage/protect/spmprotect.sh diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 1dd66d7..133143c 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -70,7 +70,6 @@ $(NULL) nodist_vdsmpylib_PYTHON = \ - dsaversion.py \ $(NULL) nodist_noinst_DATA= \ @@ -84,7 +83,6 @@ EXTRA_DIST = \ - dsaversion.py.in \ vdsm.conf.sample \ $(NULL) diff --git a/lib/vdsm/common/Makefile.am b/lib/vdsm/common/Makefile.am index 3dafdc9..ec30777 100644 --- a/lib/vdsm/common/Makefile.am +++ b/lib/vdsm/common/Makefile.am @@ -25,6 +25,7 @@ nodist_vdsmcommon_PYTHON = \ config.py \ constants.py \ + dsaversion.py \ $(NULL) dist_vdsmcommon_PYTHON = \ @@ -34,6 +35,7 @@ EXTRA_DIST = \ config.py.in \ constants.py.in \ + dsaversion.py.in \ $(NULL) CLEANFILES = \ diff --git a/lib/vdsm/dsaversion.py.in b/lib/vdsm/common/dsaversion.py.in similarity index 100% rename from lib/vdsm/dsaversion.py.in rename to lib/vdsm/common/dsaversion.py.in diff --git a/lib/vdsm/host/caps.py b/lib/vdsm/host/caps.py index 21c02a8..73378f0 100644 --- a/lib/vdsm/host/caps.py +++ b/lib/vdsm/host/caps.py @@ -27,13 +27,13 @@ import libvirt from vdsm.common import cache +from vdsm.common import dsaversion from vdsm.config import config from vdsm.host import rngsources from vdsm.storage import hba from vdsm import containersconnection from vdsm import cpuarch from vdsm import cpuinfo -from vdsm import dsaversion from vdsm import hooks from vdsm import host from vdsm import hostdev diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index ff16817..2a4c89b 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -32,10 +32,11 @@ import six -from vdsm import dsaversion from vdsm import hooks + from vdsm.common import concurrent from vdsm.common import constants +from vdsm.common import dsaversion from vdsm.common import fileutils from vdsm.common.config import config from vdsm.common.conv import tobool diff --git a/lib/vdsm/vdsmd.py b/lib/vdsm/vdsmd.py index ee734bc..ff9deaa 100755 --- a/lib/vdsm/vdsmd.py +++ b/lib/vdsm/vdsmd.py @@ -30,7 +30,6 @@ from vdsm import commands from vdsm import constants -from vdsm import dsaversion from vdsm import health from vdsm import jobs from vdsm import schedule @@ -38,6 +37,7 @@ from vdsm import containersconnection from vdsm import taskset from vdsm import metrics +from vdsm.common import dsaversion from vdsm.common import sigutils from vdsm.common import time from vdsm.common import zombiereaper diff --git a/vdsm.spec.in b/vdsm.spec.in index 4a57f5c..a9e0f83 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -736,7 +736,7 @@ rawversion=%{version}-%{release} sed -i -e 's/^software_version =.*/software_version = "'"${baseversion}"'"/' \ -e 's/^raw_version_revision =.*/raw_version_revision = "'"${rawversion}"'"/' \ - -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' lib/vdsm/dsaversion.py + -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' lib/vdsm/common/dsaversion.py %install make DESTDIR=%{buildroot} install @@ -1058,7 +1058,6 @@ %{python_sitelib}/%{vdsm_name}/containersconnection.py* %{python_sitelib}/%{vdsm_name}/cpuarch.py* %{python_sitelib}/%{vdsm_name}/cpuinfo.py* -%{python_sitelib}/%{vdsm_name}/dsaversion.py* %{python_sitelib}/%{vdsm_name}/dmidecodeUtil.py* %{python_sitelib}/%{vdsm_name}/executor.py* # gluster.exception is used in many places like Bridge.py. So it is required -- To view, visit https://gerrit.ovirt.org/80954 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I687bf30db22fe43f685d89dab09a7e0abdd82db6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
