Change in vdsm[master]: move blkid to lib

ybronhei at redhat.com ybronhei at redhat.com
Tue Feb 23 08:28:26 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: move blkid to lib
......................................................................

move blkid to lib

Change-Id: I92390e82e1bc6b2170c81711ba0e639e3b0a3017
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/blkid.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/clientIF.py
7 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/53872/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 35ee322..3bf64e1 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -2,6 +2,7 @@
 ./usr/bin/vdsm-tool
 ./usr/lib/python2.7/dist-packages/vdsm/__init__.py
 ./usr/lib/python2.7/dist-packages/vdsm/alignmentScan.py
+./usr/lib/python2.7/dist-packages/vdsm/blkid.py
 ./usr/lib/python2.7/dist-packages/vdsm/cmdutils.py
 ./usr/lib/python2.7/dist-packages/vdsm/compat.py
 ./usr/lib/python2.7/dist-packages/vdsm/concurrent.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 7ebf3da..9e9482f 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -34,7 +34,6 @@
 ./usr/libexec/vdsm/wait_for_ipv4s
 ./usr/share/man/man8/vdsmd.8
 ./usr/share/vdsm/API.py
-./usr/share/vdsm/blkid.py
 ./usr/share/vdsm/caps.py
 ./usr/share/vdsm/clientIF.py
 ./usr/share/vdsm/daemonAdapter
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 74f89de..effd523 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -24,6 +24,7 @@
 dist_vdsmpylib_PYTHON = \
 	__init__.py \
 	alignmentScan.py \
+	blkid.py \
 	cmdutils.py \
 	compat.py \
 	commands.py \
diff --git a/vdsm/blkid.py b/lib/vdsm/blkid.py
similarity index 97%
rename from vdsm/blkid.py
rename to lib/vdsm/blkid.py
index b6f746d..3713949 100644
--- a/vdsm/blkid.py
+++ b/lib/vdsm/blkid.py
@@ -17,6 +17,8 @@
 #
 # Refer to the README and COPYING files for full details of the license
 #
+from __future__ import absolute_import
+
 
 from vdsm import constants
 from vdsm import commands
diff --git a/vdsm.spec.in b/vdsm.spec.in
index bf2b891..a5d300b 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -843,7 +843,6 @@
 %dir %{_datadir}/%{vdsm_name}/virt
 %dir %{_datadir}/%{vdsm_name}/virt/vmdevices
 %dir %{_datadir}/%{vdsm_name}/rpc
-%{_datadir}/%{vdsm_name}/blkid.py*
 %{_datadir}/%{vdsm_name}/caps.py*
 %{_datadir}/%{vdsm_name}/clientIF.py*
 %{_datadir}/%{vdsm_name}/daemonAdapter
@@ -1082,6 +1081,7 @@
 %dir %{python_sitelib}/%{vdsm_name}/tc
 %{python_sitelib}/%{vdsm_name}/__init__.py*
 %{python_sitelib}/%{vdsm_name}/alignmentScan.py*
+%{python_sitelib}/%{vdsm_name}/blkid.py*
 %{python_sitelib}/%{vdsm_name}/cmdutils.py*
 %{python_sitelib}/%{vdsm_name}/compat.py*
 %{python_sitelib}/%{vdsm_name}/commands.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index a61c749..9ebecf5 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -24,7 +24,6 @@
 
 dist_vdsm_PYTHON = \
 	API.py \
-	blkid.py \
 	caps.py \
 	clientIF.py \
 	hooking.py \
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 7f15eb0..e0fe2fd 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -38,12 +38,12 @@
 from vdsm.sslcompat import sslutils
 import libvirt
 from vdsm import alignmentScan
+from vdsm import blkid
 from vdsm import libvirtconnection
 from vdsm import concurrent
 from vdsm import utils
 from vdsm import supervdsm
 import caps
-import blkid
 from protocoldetector import MultiProtocolAcceptor
 
 from virt import migration


-- 
To view, visit https://gerrit.ovirt.org/53872
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92390e82e1bc6b2170c81711ba0e639e3b0a3017
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list