Change in vdsm[master]: storage: move curlImgWrap.py to vdsm storage lib

ishaby at redhat.com ishaby at redhat.com
Tue Apr 26 15:03:25 UTC 2016


Idan Shaby has uploaded a new change for review.

Change subject: storage: move curlImgWrap.py to vdsm storage lib
......................................................................

storage: move curlImgWrap.py to vdsm storage lib

This patch moves the module vdsm/storage/curlImgWrap.py to
lib/vdsm/storage/curlImgWrap.py.

Change-Id: Iddcc2de787bfb639c2869408fff346d3c6390f5a
Signed-off-by: Idan Shaby <ishaby at redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/curlImgWrap.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/imageSharing.py
5 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/56642/1

diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 190bec1..f8ae17f 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -25,6 +25,7 @@
 	__init__.py \
 	clusterlock.py \
 	constants.py \
+	curlImgWrap.py \
 	exception.py \
 	fileUtils.py \
 	fuser.py \
diff --git a/vdsm/storage/curlImgWrap.py b/lib/vdsm/storage/curlImgWrap.py
similarity index 96%
rename from vdsm/storage/curlImgWrap.py
rename to lib/vdsm/storage/curlImgWrap.py
index b8dfa48..f4fedde 100644
--- a/vdsm/storage/curlImgWrap.py
+++ b/lib/vdsm/storage/curlImgWrap.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2013 Red Hat, Inc.
+# Copyright 2013-2016 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
+from __future__ import absolute_import
+
 import signal
 
 from vdsm import commands
diff --git a/vdsm.spec.in b/vdsm.spec.in
index cb6bd5c..b5b8540 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -927,7 +927,6 @@
 %{_datadir}/%{vdsm_name}/storage/__init__.py*
 %{_datadir}/%{vdsm_name}/storage/blockSD.py*
 %{_datadir}/%{vdsm_name}/storage/blockVolume.py*
-%{_datadir}/%{vdsm_name}/storage/curlImgWrap.py*
 %{_datadir}/%{vdsm_name}/storage/devicemapper.py*
 %{_datadir}/%{vdsm_name}/storage/dispatcher.py*
 %{_datadir}/%{vdsm_name}/storage/monitor.py*
@@ -1173,6 +1172,7 @@
 %{python_sitelib}/%{vdsm_name}/storage/__init__.py*
 %{python_sitelib}/%{vdsm_name}/storage/clusterlock.py*
 %{python_sitelib}/%{vdsm_name}/storage/constants.py*
+%{python_sitelib}/%{vdsm_name}/storage/curlImgWrap.py*
 %{python_sitelib}/%{vdsm_name}/storage/exception.py*
 %{python_sitelib}/%{vdsm_name}/storage/fileUtils.py*
 %{python_sitelib}/%{vdsm_name}/storage/fuser.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 031384f..e3f0fc4 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -27,7 +27,6 @@
 	__init__.py \
 	blockSD.py \
 	blockVolume.py \
-	curlImgWrap.py \
 	devicemapper.py \
 	dispatcher.py \
 	fileSD.py \
diff --git a/vdsm/storage/imageSharing.py b/vdsm/storage/imageSharing.py
index ecefcd0..169572b 100644
--- a/vdsm/storage/imageSharing.py
+++ b/vdsm/storage/imageSharing.py
@@ -20,9 +20,9 @@
 import logging
 import signal
 
-import curlImgWrap
 from vdsm import constants
 from vdsm import commands
+from vdsm.storage import curlImgWrap
 from vdsm.storage import exception as se
 
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddcc2de787bfb639c2869408fff346d3c6390f5a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Idan Shaby <ishaby at redhat.com>


More information about the vdsm-patches mailing list