Hello community,
here is the log from the commit of package python3-ec2imgutils for
openSUSE:Factory checked in at 2020-06-09 00:09:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-ec2imgutils (Old)
and /work/SRC/openSUSE:Factory/.python3-ec2imgutils.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-ec2imgutils"
Tue Jun 9 00:09:47 2020 rev:10 rq:812633 version:8.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-ec2imgutils/python3-ec2imgutils.changes
2020-06-06 23:39:47.156987696 +0200
+++
/work/SRC/openSUSE:Factory/.python3-ec2imgutils.new.3606/python3-ec2imgutils.changes
2020-06-09 00:12:16.686829379 +0200
@@ -1,0 +2,7 @@
+Mon Jun 8 13:52:22 UTC 2020 - Robert Schweikert <[email protected]>
+
+- Update to version 8.1.1
+ + Handle log adapter when getting log_level and set log_level as
+ instance attr
+
+-------------------------------------------------------------------
Old:
----
ec2imgutils-8.1.0.tar.bz2
New:
----
ec2imgutils-8.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-ec2imgutils.spec ++++++
--- /var/tmp/diff_new_pack.bmEEHY/_old 2020-06-09 00:12:17.702832497 +0200
+++ /var/tmp/diff_new_pack.bmEEHY/_new 2020-06-09 00:12:17.702832497 +0200
@@ -19,7 +19,7 @@
%define upstream_name ec2imgutils
Name: python3-ec2imgutils
-Version: 8.1.0
+Version: 8.1.1
Release: 0
Summary: Image management utilities for AWS EC2
License: GPL-3.0-or-later
++++++ ec2imgutils-8.1.0.tar.bz2 -> ec2imgutils-8.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2imgutils-8.1.0/lib/ec2imgutils/VERSION
new/ec2imgutils-8.1.1/lib/ec2imgutils/VERSION
--- old/ec2imgutils-8.1.0/lib/ec2imgutils/VERSION 2020-06-05
20:20:40.165819674 +0200
+++ new/ec2imgutils-8.1.1/lib/ec2imgutils/VERSION 2020-06-08
15:51:20.976472589 +0200
@@ -1 +1 @@
-8.1.0
+8.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2imgutils-8.1.0/lib/ec2imgutils/ec2imgutils.py
new/ec2imgutils-8.1.1/lib/ec2imgutils/ec2imgutils.py
--- old/ec2imgutils-8.1.0/lib/ec2imgutils/ec2imgutils.py 2020-06-05
20:20:40.165819674 +0200
+++ new/ec2imgutils-8.1.1/lib/ec2imgutils/ec2imgutils.py 2020-06-08
15:51:20.976472589 +0200
@@ -36,6 +36,11 @@
logger.setLevel(log_level)
self.log = logger
+ try:
+ self.log_level = self.log.level
+ except AttributeError:
+ self.log_level = self.log.logger.level # LoggerAdapter
+
# ---------------------------------------------------------------------
def _connect(self):
"""Connect to EC2"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2imgutils-8.1.0/lib/ec2imgutils/ec2uploadimg.py
new/ec2imgutils-8.1.1/lib/ec2imgutils/ec2uploadimg.py
--- old/ec2imgutils-8.1.0/lib/ec2imgutils/ec2uploadimg.py 2020-06-05
20:20:40.165819674 +0200
+++ new/ec2imgutils-8.1.1/lib/ec2imgutils/ec2uploadimg.py 2020-06-08
15:51:20.976472589 +0200
@@ -148,7 +148,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -229,11 +229,11 @@
):
"""Check the wait status form the waiter and take appropriate action"""
if wait_status:
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print()
if repeat_count == self.wait_count:
self.operation_complete = True
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
time.sleep(self.default_sleep) # Wait for the thread
if not skip_cleanup:
@@ -249,10 +249,10 @@
else:
repeat_count = self.wait_count + 1
self.operation_complete = True
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
time.sleep(self.default_sleep) # Wait for the thread
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print()
return repeat_count
@@ -280,7 +280,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -391,7 +391,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -455,7 +455,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -498,7 +498,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -567,14 +567,14 @@
instance_ip = instance.get('PublicIpAddress')
if self.use_private_ip:
instance_ip = instance.get('PrivateIpAddress')
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print('. ', end=' ')
sys.stdout.flush()
if timeout_counter * self.default_sleep >= self.ssh_timeout:
msg = 'Unable to obtain the instance IP address'
raise EC2UploadImgException(msg)
timeout_counter += 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print()
client = paramiko.client.SSHClient()
client.set_missing_host_key_policy(paramiko.WarningPolicy())
@@ -589,7 +589,7 @@
hostname=instance_ip
)
except Exception:
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print('. ', end=' ')
sys.stdout.flush()
time.sleep(self.default_sleep)
@@ -817,7 +817,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -903,7 +903,7 @@
# Taking a nap on the client side avoids the problem
time.sleep(self.default_sleep)
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print('. ', end=' ')
sys.stdout.flush()
timeout_counter += 1
@@ -927,7 +927,7 @@
sftp.put(source,
'%s/%s' % (target_dir, filename),
self._upload_progress)
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print()
except Exception as e:
self._clean_up()
@@ -938,7 +938,7 @@
# ---------------------------------------------------------------------
def _upload_progress(self, transferred_bytes, total_bytes):
"""In verbose mode give an upload progress indicator"""
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
percent_complete = (float(transferred_bytes) / total_bytes) * 100
if percent_complete - self.percent_transferred >= 10:
print('.', end=' ')
@@ -1019,7 +1019,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -1090,7 +1090,7 @@
)
except Exception:
wait_status = 1
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
self.progress_timer.cancel()
repeat_count = self._check_wait_status(
wait_status,
@@ -1105,7 +1105,7 @@
# ---------------------------------------------------------------------
def create_snapshot(self, source):
"""Create a snapshot from the given source"""
- if self.log.level == logging.DEBUG:
+ if self.log_level == logging.DEBUG:
print()
root_volume = self._create_image_root_volume(source)
snapshot = self._create_snapshot(root_volume)
