[Erp5-report] r35310 rafael - /erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 14 06:11:35 CEST 2010
Author: rafael
Date: Fri May 14 06:11:35 2010
New Revision: 35310
URL: http://svn.erp5.org?rev=35310&view=rev
Log:
Do not check MD5 if the image is already used
Modified:
erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py
Modified: erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py?rev=35310&r1=35309&r2=35310&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py [utf8] Fri May 14 06:11:35 2010
@@ -76,9 +76,6 @@
image = self.copy(download_file)
else:
image = options.get('file')
-
- md5_image = options.get("md5_image", None)
- assert zc.buildout.download.check_md5sum(image, md5_image) == True
image_type = options.get("image_type")
if image_type == "drive":
@@ -177,9 +174,17 @@
if self.options["gzip"].lower() == "true":
self._gunzip(download_file, image)
- return image
+ return self._checkMD5(image)
os.copy(download_file, image)
+ return self._checkMD5(image)
+
+ def _checkMD5(self, image):
+ """ Verify MD5.
+ """
+ options = self.options
+ md5_image = options.get("md5_image", None)
+ assert zc.buildout.download.check_md5sum(image, md5_image) == True
return image
def _gunzip(self, download_file, image):
More information about the Erp5-report
mailing list