From 08f267966c266f4b7a980b2a0d41a53078bc673f Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 6 Jun 2012 12:05:56 +0300
Subject: [PATCH] Fix a bug in Output.progress_generator
The progress bar of the progress generator had a wrong max attribute.
---
image_creator/kamaki_wrapper.py | 6 ++++--
image_creator/output.py | 8 +++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index e1f3a02..b8e3e6b 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -75,8 +75,10 @@ class Kamaki(object):
raise FatalError("Pithos client: %d %s" % \
(e.status, e.message))
try:
- hash_cb = self.out.progress_gen(hp) if hp is not None else None
- upload_cb = self.out.progress_gen(up) if up is not None else None
+ hash_cb = self.out.progress_generator(hp) \
+ if hp is not None else None
+ upload_cb = self.out.progress_generator(up) \
+ if up is not None else None
self.pithos_client.create_object(remote_path, file_obj, size,
hash_cb, upload_cb)
return "pithos://%s/%s/%s" % \
diff --git a/image_creator/output.py b/image_creator/output.py
index 0f33f6d..fc3c422 100644
--- a/image_creator/output.py
+++ b/image_creator/output.py
@@ -86,12 +86,10 @@ class Output(object):
def success(self, result):
sucess(result)
- def progress_gen(self, message):
-
- progress = getattr(self, 'Progress')
-
+ def progress_generator(self, message):
def generator(n):
- progressbar = progress(message, 'default')
+ progressbar = self.Progress(message, 'default')
+ progressbar.max = n
for _ in range(n):
yield
--
GitLab