Hello community, here is the log from the commit of package openlmi-tools for openSUSE:Factory checked in at 2014-01-30 11:36:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-tools (Old) and /work/SRC/openSUSE:Factory/.openlmi-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openlmi-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-tools/openlmi-tools.changes 2013-11-13 10:18:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openlmi-tools.new/openlmi-tools.changes 2014-01-30 11:36:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 20 14:00:26 UTC 2014 - [email protected] + +- fix SLE11 build, add python-2.6.patch + +------------------------------------------------------------------- New: ---- python-2.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-tools.spec ++++++ --- /var/tmp/diff_new_pack.krLZfN/_old 2014-01-30 11:36:36.000000000 +0100 +++ /var/tmp/diff_new_pack.krLZfN/_new 2014-01-30 11:36:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openlmi-tools # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 Redhat, Inc # # All modifications and additions to the file contributed by third parties @@ -30,6 +30,9 @@ Url: http://fedorahosted.org/openlmi/ Source0: %{name}-%{version}.tar.bz2 +# Python 2.6 vs 2.7 dict creation syntax change, [email protected] +# See http://stackoverflow.com/questions/1747817/python-create-a-dictionary-with-list-comprehension +Patch: python-2.6.patch BuildRequires: autoconf BuildRequires: automake @@ -72,6 +75,9 @@ %prep %setup -q +%if 0%{?suse_version} == 1110 +%patch -p1 +%endif %build ++++++ python-2.6.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIInstance.py ./cli/lmi/shell/LMIInstance.py --- ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIInstance.py 2013-11-04 15:50:20.000000000 +0100 +++ ./cli/lmi/shell/LMIInstance.py 2014-01-20 14:59:44.588223271 +0100 @@ -595,8 +595,8 @@ :returns: dictionary of :py:class:`CIMInstance` properties :raises: :py:exc:`.LMIDeletedObjectError` """ - return pywbem.NocaseDict({ - k: x.value for k, x in self._cim_instance.properties.iteritems()}) + return pywbem.NocaseDict( + dict((k, x.value) for k, x in self._cim_instance.properties.iteritems())) @lmi_possibly_deleted(None) def property_value(self, prop_name): diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIMethod.py ./cli/lmi/shell/LMIMethod.py --- ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIMethod.py 2013-11-04 15:50:20.000000000 +0100 +++ ./cli/lmi/shell/LMIMethod.py 2014-01-20 14:58:44.857763554 +0100 @@ -192,9 +192,7 @@ rval = None rparams = pywbem.NocaseDict() if not job_inst.JobOutParameters is None: - rparams = pywbem.NocaseDict({ - k: x.value - for k, x in job_inst.JobOutParameters.properties.iteritems()}) + rparams = pywbem.NocaseDict(dict((k, x.value) for k, x in job_inst.JobOutParameters.properties.iteritems())) rval = rparams["__ReturnValue"] del rparams["__ReturnValue"] # NocaseDict has no pop() errorstr = "" diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIUtil.py ./cli/lmi/shell/LMIUtil.py --- ../orig-openlmi-tools-0.9/cli/lmi/shell/LMIUtil.py 2013-11-04 15:50:20.000000000 +0100 +++ ./cli/lmi/shell/LMIUtil.py 2014-01-20 14:57:20.310281826 +0100 @@ -132,8 +132,7 @@ """ cast_func = cast.get(t.lower(), lambda x: x) if isinstance(value, (dict, pywbem.NocaseDict)): - return pywbem.NocaseDict({ - k: _lmi_do_cast(t, val, cast) for k, val in value.iteritems()}) + return pywbem.NocaseDict(dict((k, _lmi_do_cast(t, val, cast)) for k, val in value.iteritems())) elif isinstance(value, list): return map(lambda val: _lmi_do_cast(t, val, cast), value) elif isinstance(value, tuple): @@ -267,9 +266,7 @@ elif isinstance(value, pywbem.CIMFloat): return float(value) elif isinstance(value, (dict, pywbem.NocaseDict)): - return pywbem.NocaseDict({ - k: lmi_transform_to_lmi(conn, val) - for k, val in value.iteritems()}) + return pywbem.NocaseDict(dict((k, lmi_transform_to_lmi(conn, val)) for k, val in value.iteritems())) elif isinstance(value, list): return map(lambda val: lmi_transform_to_lmi(conn, val), value) elif isinstance(value, tuple): @@ -328,7 +325,7 @@ def make_key(path): path.host = None return hashlib.md5(path.classname.lower() + path.namespace.lower() + \ - str({ k.lower() : v for k, v in path.keybindings.iteritems() })).hexdigest() + str(dict((k.lower(), v) for k, v in path.keybindings.iteritems() ))).hexdigest() result = [] @@ -352,7 +349,7 @@ # Get instances, which will be joined as associators for ref_class_name in ref_class_names: (inst_list, out, err) = conn._client._get_instances(ref_class_name) - instances.update({ make_key(inst.path) : inst for inst in inst_list }) + instances.update(dict((make_key(inst.path), inst) for inst in inst_list)) # Join associated objects (assoc_instance_names, out, err) = conn._client._get_instance_names(assoc_class.classname) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
