Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2020-11-13 19:00:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler"
Fri Nov 13 19:00:37 2020 rev:60 rq:848373 version:3.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-11-04
18:32:26.468141212 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new.24930/cobbler.changes
2020-11-13 19:00:52.206236522 +0100
@@ -1,0 +2,7 @@
+Fri Nov 13 15:57:26 UTC 2020 - Jochen Breuer <jbre...@suse.de>
+
+- Remove redundant '.json' suffix
+- Added:
+ * remove-redundant-json-suffix.diff
+
+-------------------------------------------------------------------
New:
----
remove-redundant-json-suffix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cobbler.spec ++++++
--- /var/tmp/diff_new_pack.slXwfV/_old 2020-11-13 19:00:53.218237783 +0100
+++ /var/tmp/diff_new_pack.slXwfV/_new 2020-11-13 19:00:53.222237788 +0100
@@ -135,6 +135,7 @@
Patch1: refactored_auth_module.diff
Patch2: load_module_apache_suse_fix.diff
Patch3: fix-for-old-str.join-usage.diff
+Patch4: remove-redundant-json-suffix.diff
BuildRequires: git-core
BuildRequires: %{system_release_pkg}
@@ -271,6 +272,7 @@
%patch2 -p1
%endif
%patch3 -p1
+%patch4 -p1
%if 0%{?suse_version}
# Set tftpboot location correctly for SUSE distributions
++++++ remove-redundant-json-suffix.diff ++++++
diff --git a/cobbler/modules/serializers/file.py
b/cobbler/modules/serializers/file.py
index c57eded5c..c3362af35 100644
--- a/cobbler/modules/serializers/file.py
+++ b/cobbler/modules/serializers/file.py
@@ -71,7 +71,6 @@ def serialize_item(collection, item):
sort_keys = False
indent = None
- filename += ".json"
_dict = item.to_dict()
fd = open(filename, "w+")
data = simplejson.dumps(_dict, encoding="utf-8", sort_keys=sort_keys,
indent=indent)
@@ -91,7 +90,6 @@ def serialize_delete(collection, item):
collection_types = collection.collection_types()
filename = os.path.join(libpath, collection_types, item.name + ".json")
- filename += ".json"
if os.path.exists(filename):
os.remove(filename)
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
