Commit 0aec6e40 authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'master' into debian

parents f64af49b 883e57b0
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
# interpreted as representing official policies, either expressed # interpreted as representing official policies, either expressed
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
import gevent.monkey # Monkey-patch everything for gevent early on
gevent.monkey.patch_all()
import dialog import dialog
import sys import sys
import os import os
......
...@@ -443,7 +443,8 @@ class DiskDevice(object): ...@@ -443,7 +443,8 @@ class DiskDevice(object):
progressbar.next() progressbar.next()
while left > 0: while left > 0:
length = min(left, blocksize) length = min(left, blocksize)
sent = sendfile(dst.fileno(), src.fileno(), offset, length) _, sent = sendfile(dst.fileno(), src.fileno(), offset,
length)
offset += sent offset += sent
left -= sent left -= sent
progressbar.goto((size - left) // MB) progressbar.goto((size - left) // MB)
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
from os.path import basename from os.path import basename
from kamaki.config import Config from kamaki.cli.config import Config
from kamaki.clients import ClientError from kamaki.clients import ClientError
from kamaki.clients.image import ImageClient from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient from kamaki.clients.pithos import PithosClient
......
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
# interpreted as representing official policies, either expressed # interpreted as representing official policies, either expressed
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
import gevent.monkey # Monkey-patch everything for gevent early on
gevent.monkey.patch_all()
from image_creator import __version__ as version from image_creator import __version__ as version
from image_creator import util from image_creator import util
from image_creator.disk import Disk from image_creator.disk import Disk
......
...@@ -46,7 +46,8 @@ setup( ...@@ -46,7 +46,8 @@ setup(
license='BSD', license='BSD',
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
install_requires=['sh', 'ansicolors', 'progress>=1.0.2', 'pysendfile'], install_requires=['sh', 'ansicolors', 'progress>=1.0.2', 'py-sendfile',
'gevent'],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'snf-image-creator = image_creator.main:main', 'snf-image-creator = image_creator.main:main',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment