[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 3c5a8ea2242e48c3182beb9964e5cf5abc316afd
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Apr 17 13:41:36 2013 -0700

    Work with python-progressbar 2.2

diff --git a/euca2ools/commands/bundle/bundle.py b/euca2ools/commands/bundle/bundle.py
index d6c94de..ae00179 100644
--- a/euca2ools/commands/bundle/bundle.py
+++ b/euca2ools/commands/bundle/bundle.py
@@ -169,7 +169,7 @@ def _write_tarball(infile, outfile, show_progress=False):
         import progressbar
         widgets = [progressbar.Percentage(), ' ', progressbar.Bar(marker='='),
                    ' ', progressbar.FileTransferSpeed(), ' ',
-                   progressbar.AdaptiveETA()]
+                   progressbar.ETA()]
         bar = progressbar.ProgressBar(maxval=os.path.getsize(infile.name),
                                       widgets=widgets)
         bar.start()
diff --git a/euca2ools/commands/walrus/putobject.py b/euca2ools/commands/walrus/putobject.py
index 8cc8a95..0e27b0d 100644
--- a/euca2ools/commands/walrus/putobject.py
+++ b/euca2ools/commands/walrus/putobject.py
@@ -117,7 +117,7 @@ class PutObject(WalrusRequest):
                                filename_padding, ' ', progressbar.Percentage(),
                                ' ', progressbar.Bar(marker='='), ' ',
                                progressbar.FileTransferSpeed(), ' ',
-                               progressbar.AdaptiveETA()]
+                               progressbar.ETA()]
                     bar = progressbar.ProgressBar(
                         maxval=os.path.getsize(source_filename),
                         widgets=widgets)

-- 
managing cloud instances for Eucalyptus