Hello community,
here is the log from the commit of package python3-azuremetadata for
openSUSE:Leap:15.2 checked in at 2020-05-03 14:29:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python3-azuremetadata (Old)
and /work/SRC/openSUSE:Leap:15.2/.python3-azuremetadata.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-azuremetadata"
Sun May 3 14:29:14 2020 rev:3 rq:799672 version:5.1.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/python3-azuremetadata/python3-azuremetadata.changes
2020-04-25 19:06:26.383770526 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.python3-azuremetadata.new.2738/python3-azuremetadata.changes
2020-05-03 14:30:18.388637480 +0200
@@ -1,0 +2,7 @@
+Mon Apr 27 14:51:02 UTC 2020 - Ivan Kapelyukhin <ikapelyuk...@suse.com>
+
+- Version 5.1.0
+- Produce well-formed JSON and XML output when multiple filters
+ are specified (bsc#1170598, bsc#1170599)
+
+-------------------------------------------------------------------
Old:
----
python3-azuremetadata-5.0.1.tar.bz2
New:
----
python3-azuremetadata-5.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-azuremetadata.spec ++++++
--- /var/tmp/diff_new_pack.v615Eb/_old 2020-05-03 14:30:18.792638341 +0200
+++ /var/tmp/diff_new_pack.v615Eb/_new 2020-05-03 14:30:18.796638350 +0200
@@ -18,7 +18,7 @@
%define upstream_name azuremetadata
Name: python3-azuremetadata
-Version: 5.0.1
+Version: 5.1.0
# Packaged renamed in SLE15
Provides: azuremetadata
Obsoletes: azuremetadata < 5.0.0
++++++ python3-azuremetadata-5.0.1.tar.bz2 ->
python3-azuremetadata-5.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python3-azuremetadata-5.0.1/azuremetadata
new/python3-azuremetadata-5.1.0/azuremetadata
--- old/python3-azuremetadata-5.0.1/azuremetadata 2020-04-21
14:42:42.873454534 +0200
+++ new/python3-azuremetadata-5.1.0/azuremetadata 2020-04-27
16:53:15.856752222 +0200
@@ -58,8 +58,7 @@
util.print_pretty(print_xml=args.xml, print_json=args.json,
file=fh)
else:
result = util.query(ordered_args)
- for item in result:
- util.print_pretty(print_xml=args.xml, print_json=args.json,
data=item, file=fh)
+ util.print_pretty(print_xml=args.xml, print_json=args.json,
data=result, file=fh)
finally:
if fh:
fh.close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python3-azuremetadata-5.0.1/lib/azuremetadata/VERSION
new/python3-azuremetadata-5.1.0/lib/azuremetadata/VERSION
--- old/python3-azuremetadata-5.0.1/lib/azuremetadata/VERSION 2020-04-21
14:42:42.873454534 +0200
+++ new/python3-azuremetadata-5.1.0/lib/azuremetadata/VERSION 2020-04-27
16:53:15.856752222 +0200
@@ -1 +1 @@
-5.0.1
\ No newline at end of file
+5.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python3-azuremetadata-5.0.1/lib/azuremetadata/azuremetadatautils.py
new/python3-azuremetadata-5.1.0/lib/azuremetadata/azuremetadatautils.py
--- old/python3-azuremetadata-5.0.1/lib/azuremetadata/azuremetadatautils.py
2020-04-21 14:42:42.873454534 +0200
+++ new/python3-azuremetadata-5.1.0/lib/azuremetadata/azuremetadatautils.py
2020-04-27 16:53:15.856752222 +0200
@@ -115,7 +115,8 @@
def query(self, args):
"""Generates output based on command line arguments."""
root = self._available_params
- result = []
+ result = {}
+ parents = []
while len(args) > 0:
arg, argval = args.pop(0)
@@ -136,18 +137,26 @@
if isinstance(value, list):
root = value[argval]
+ parents.append(arg)
continue
if isinstance(value, dict):
root = value
+ parents.append(arg)
continue
if value is None:
raise QueryException("Nothing found for '{}'".format(arg))
else:
- result.append({arg: value})
+ target = result
+ for item in parents:
+ target[item] = {}
+ target = target[item]
+
+ target[arg] = value
root = self._available_params
+ parents = []
if root != self._available_params:
raise QueryException("Unfinished query")
