Hello community,
here is the log from the commit of package python-ec2metadata for
openSUSE:Factory checked in at 2016-08-18 09:18:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ec2metadata (Old)
and /work/SRC/openSUSE:Factory/.python-ec2metadata.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ec2metadata"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-ec2metadata/python-ec2metadata.changes
2015-04-16 14:12:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-ec2metadata.new/python-ec2metadata.changes
2016-08-18 09:18:22.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 17 15:58:05 UTC 2016 - [email protected]
+
+- Bump to version 1.5.4 (bsc#994138 bsc#994139)
+ + ec2metadata: do not use proxy
+
+-------------------------------------------------------------------
Old:
----
ec2metadata-1.5.3.tar.bz2
New:
----
ec2metadata-1.5.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ec2metadata.spec ++++++
--- /var/tmp/diff_new_pack.Jp6bVQ/_old 2016-08-18 09:18:22.000000000 +0200
+++ /var/tmp/diff_new_pack.Jp6bVQ/_new 2016-08-18 09:18:22.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-ec2metadata
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define upstream_name ec2metadata
Name: python-ec2metadata
-Version: 1.5.3
+Version: 1.5.4
Release: 0
Summary: Collect instance metadata in EC2
License: GPL-3.0+
++++++ ec2metadata-1.5.3.tar.bz2 -> ec2metadata-1.5.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2metadata-1.5.3/ec2metadata
new/ec2metadata-1.5.4/ec2metadata
--- old/ec2metadata-1.5.3/ec2metadata 2015-03-31 17:23:50.000000000 +0200
+++ new/ec2metadata-1.5.4/ec2metadata 2016-08-17 17:57:34.000000000 +0200
@@ -66,9 +66,10 @@
getopt_metaopts.append('help')
getopt_metaopts.append('listapis')
getopt_metaopts.append('output')
+ getopt_metaopts.append('version')
getopt_metaopts.append('xml')
getopt_metaopts.sort()
- opts, args = getopt.gnu_getopt(sys.argv[1:], 'hlo:x', getopt_metaopts)
+ opts, args = getopt.gnu_getopt(sys.argv[1:], 'hlo:vx', getopt_metaopts)
except getopt.GetoptError, e:
usage(getopt_metaopts, e)
@@ -92,6 +93,9 @@
elif opt in ('-o', '--output'):
outFile = args[0]
continue
+ elif opt in ('-v', '--version'):
+ ec2metautils.showVersion()
+ sys.exit(0)
elif opt in ('-x', '--xml'):
genXML = True
continue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2metadata-1.5.3/lib/ec2metadata/VERSION
new/ec2metadata-1.5.4/lib/ec2metadata/VERSION
--- old/ec2metadata-1.5.3/lib/ec2metadata/VERSION 2015-03-31
17:23:50.000000000 +0200
+++ new/ec2metadata-1.5.4/lib/ec2metadata/VERSION 2016-08-17
17:57:34.000000000 +0200
@@ -1 +1 @@
-1.5.3
+1.5.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2metadata-1.5.3/lib/ec2metadata/__init__.py
new/ec2metadata-1.5.4/lib/ec2metadata/__init__.py
--- old/ec2metadata-1.5.3/lib/ec2metadata/__init__.py 2015-03-31
17:23:50.000000000 +0200
+++ new/ec2metadata-1.5.4/lib/ec2metadata/__init__.py 2016-08-17
17:57:34.000000000 +0200
@@ -71,7 +71,7 @@
def _get(self, uri):
url = 'http://%s/%s/%s' % (self.addr, self.api, uri)
- value = urllib.urlopen(url).read()
+ value = urllib.urlopen(url, proxies={}).read()
if "404 - Not Found" in value:
return None
@@ -113,7 +113,7 @@
def getAvailableAPIVersions(self):
"""Return a list of the available API versions"""
url = 'http://%s/' %self.addr
- value = urllib.urlopen(url).read()
+ value = urllib.urlopen(url, proxies={}).read()
apiVers = value.split('\n')
return apiVers
@@ -129,7 +129,7 @@
# Nothing to do
return self.api
url = 'http://%s' %self.addr
- availableAPIs = urllib.urlopen(url).read().split('\n')
+ availableAPIs = urllib.urlopen(url, proxies={}).read().split('\n')
if apiVersion not in availableAPIs:
msg = 'Requested API version "%s" not available' %apiVersion
raise EC2MetadataError(msg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2metadata-1.5.3/lib/ec2metadata/ec2metautils.py
new/ec2metadata-1.5.4/lib/ec2metadata/ec2metautils.py
--- old/ec2metadata-1.5.3/lib/ec2metadata/ec2metautils.py 2015-03-31
17:23:50.000000000 +0200
+++ new/ec2metadata-1.5.4/lib/ec2metadata/ec2metautils.py 2016-08-17
17:57:34.000000000 +0200
@@ -21,6 +21,7 @@
Utilities to implement convenience functionality. Also allows us to keep
unnecessary state out of the metadata class
"""
+import os
import sys
import ec2metadata
@@ -53,21 +54,17 @@
"""primitive: display metaopts (list) values with optional prefix"""
writefile(sys.stdout, metadata, metaopts, prefix)
-# for metaopt in metaopts:
-# value = metadata.get(metaopt)
-# if not value:
-# value = "unavailable"
-#
-# if prefix:
-# print "%s: %s" % (metaopt, value)
-# else:
-# print value
def displayXML(metadata, metaopts):
"""Collect the requested data and display it as XML"""
data = _genXML(metadata, metaopts)
print data
+def showVersion():
+ """Print the version"""
+ verPath = os.path.dirname(__file__) + '/VERSION'
+ print open(verPath).read()
+
def writefile(filePath, metadata, metaopts, prefix=False):
"""Collect the requested data and write it to the given file."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ec2metadata-1.5.3/setup.py
new/ec2metadata-1.5.4/setup.py
--- old/ec2metadata-1.5.3/setup.py 2015-03-31 17:23:50.000000000 +0200
+++ new/ec2metadata-1.5.4/setup.py 2016-08-17 17:57:34.000000000 +0200
@@ -37,6 +37,7 @@
author_email='[email protected], [email protected]',
version=version,
packages=setuptools.find_packages('lib'),
+ package_data={'ec2metadata' : ['VERSION']},
package_dir={
'': 'lib',
},
