Dima Kuznetsov has uploaded a new change for review. Change subject: dmidecodeUtil: move into lib ......................................................................
dmidecodeUtil: move into lib Change-Id: If190e2b7b07faaacdc81e59a12ec08d2bd83f4bb Signed-off-by: Dima Kuznetsov <dkuzn...@redhat.com> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/Makefile.am R lib/vdsm/dmidecodeUtil.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/supervdsmServer 7 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/44736/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index f4aea24..cb39299 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -7,6 +7,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/config.py ./usr/lib/python2.7/dist-packages/vdsm/constants.py ./usr/lib/python2.7/dist-packages/vdsm/define.py +./usr/lib/python2.7/dist-packages/vdsm/dmidecodeUtil.py ./usr/lib/python2.7/dist-packages/vdsm/exception.py ./usr/lib/python2.7/dist-packages/vdsm/executor.py ./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py diff --git a/debian/vdsm.install b/debian/vdsm.install index b7cc114..0bfbcc3 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -39,7 +39,6 @@ ./usr/share/vdsm/clientIF.py ./usr/share/vdsm/daemonAdapter ./usr/share/vdsm/debugPluginClient.py -./usr/share/vdsm/dmidecodeUtil.py ./usr/share/vdsm/dsaversion.py ./usr/share/vdsm/dumpStorageTable.py ./usr/share/vdsm/get-conf-item diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 02faeb8..f23076c 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -27,6 +27,7 @@ compat.py \ concurrent.py \ define.py \ + dmidecodeUtil.py \ exception.py \ executor.py \ ipwrapper.py \ diff --git a/vdsm/dmidecodeUtil.py b/lib/vdsm/dmidecodeUtil.py similarity index 100% rename from vdsm/dmidecodeUtil.py rename to lib/vdsm/dmidecodeUtil.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 98ee569..6d7c026 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -794,7 +794,6 @@ %{_datadir}/%{vdsm_name}/caps.py* %{_datadir}/%{vdsm_name}/clientIF.py* %{_datadir}/%{vdsm_name}/daemonAdapter -%{_datadir}/%{vdsm_name}/dmidecodeUtil.py* %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* @@ -1043,6 +1042,7 @@ %{python_sitelib}/%{vdsm_name}/config.py* %{python_sitelib}/%{vdsm_name}/constants.py* %{python_sitelib}/%{vdsm_name}/define.py* +%{python_sitelib}/%{vdsm_name}/dmidecodeUtil.py* %{python_sitelib}/%{vdsm_name}/exception.py* %{python_sitelib}/%{vdsm_name}/executor.py* %{python_sitelib}/%{vdsm_name}/ipwrapper.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 89c2a87..f6ca3ac 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -29,7 +29,6 @@ caps.py \ clientIF.py \ debugPluginClient.py \ - dmidecodeUtil.py \ hooking.py \ hooks.py \ hostdev.py \ diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index 41d5590..d5cfd58 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -133,7 +133,7 @@ @logDecorator def getHardwareInfo(self, *args, **kwargs): if platform.machine() in ('x86_64', 'i686'): - from dmidecodeUtil import getHardwareInfoStructure + from vdsm.dmidecodeUtil import getHardwareInfoStructure return getHardwareInfoStructure() elif platform.machine() in Architecture.POWER: from ppc64HardwareInfo import getHardwareInfoStructure -- To view, visit https://gerrit.ovirt.org/44736 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If190e2b7b07faaacdc81e59a12ec08d2bd83f4bb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuzn...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches