Hello community,
here is the log from the commit of package unknown-horizons for
openSUSE:Factory checked in at 2020-07-14 07:59:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unknown-horizons (Old)
and /work/SRC/openSUSE:Factory/.unknown-horizons.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unknown-horizons"
Tue Jul 14 07:59:44 2020 rev:5 rq:820625 version:2019.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/unknown-horizons/unknown-horizons.changes
2020-06-04 17:56:01.896926750 +0200
+++
/work/SRC/openSUSE:Factory/.unknown-horizons.new.3060/unknown-horizons.changes
2020-07-14 08:00:45.946076417 +0200
@@ -1,0 +2,5 @@
+Mon Jul 6 03:55:20 UTC 2020 - Bernhard Wiedemann <[email protected]>
+
+- Add reproducible.patch to sort file lists (boo#1041090)
+
+-------------------------------------------------------------------
New:
----
reproducible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unknown-horizons.spec ++++++
--- /var/tmp/diff_new_pack.R14Yn8/_old 2020-07-14 08:00:48.230083813 +0200
+++ /var/tmp/diff_new_pack.R14Yn8/_new 2020-07-14 08:00:48.234083826 +0200
@@ -32,6 +32,8 @@
Patch1: 0001-replace-deprecated-to-distro-package-2910.patch
# PATCH-FIX-OPENSUSE -- Use python3 without env for rpm detection
Patch2: rpm-shbang.patch
+# PATCH-FIX-UPSTREAM
https://github.com/unknown-horizons/unknown-horizons/pull/2943
+Patch3: reproducible.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: fife-devel >= 0.4.2
++++++ reproducible.patch ++++++
https://github.com/unknown-horizons/unknown-horizons/pull/2943 filesys
https://github.com/unknown-horizons/unknown-horizons/pull/2944 buildfix
Index: unknown-horizons-2019.1/horizons/util/loaders/loader.py
===================================================================
--- unknown-horizons-2019.1.orig/horizons/util/loaders/loader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/loader.py
@@ -141,5 +141,5 @@ class GeneralLoader:
Discards everything else that we found living there in the past.
"""
junk = set(('.DS_Store', ))
- return [d for d in os.listdir(directory)
+ return [d for d in sorted(os.listdir(directory))
if d not in junk]
Index: unknown-horizons-2019.1/horizons/util/loaders/actionsetloader.py
===================================================================
--- unknown-horizons-2019.1.orig/horizons/util/loaders/actionsetloader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/actionsetloader.py
@@ -47,7 +47,7 @@ class ActionSetLoader:
def _find_action_sets(cls, Dir):
"""Traverses recursively starting from dir to find action sets.
It is similar to os.walk, but more optimized for this use
case."""
- for entry in os.listdir(Dir):
+ for entry in sorted(os.listdir(Dir)):
full_path = os.path.join(Dir, entry)
if entry.startswith("as_"):
cls.action_sets[entry] =
GeneralLoader._load_action(full_path)
Index: unknown-horizons-2019.1/horizons/util/loaders/tilesetloader.py
===================================================================
--- unknown-horizons-2019.1.orig/horizons/util/loaders/tilesetloader.py
+++ unknown-horizons-2019.1/horizons/util/loaders/tilesetloader.py
@@ -47,7 +47,7 @@ class TileSetLoader:
def _find_tile_sets(cls, dir):
"""Traverses recursively starting from dir to find action sets.
It is similar to os.walk, but more optimized for this use
case."""
- for entry in os.listdir(dir):
+ for entry in sorted(os.listdir(dir)):
full_path = os.path.join(dir, entry)
if entry.startswith("ts_"):
cls.tile_sets[entry] =
GeneralLoader._load_action(full_path)
Index: unknown-horizons-2019.1/horizons/engine/generate_atlases.py
===================================================================
--- unknown-horizons-2019.1.orig/horizons/engine/generate_atlases.py
+++ unknown-horizons-2019.1/horizons/engine/generate_atlases.py
@@ -404,7 +404,10 @@ class AtlasGenerator:
if not os.path.exists(path):
continue
cls.log.info('Deleting %s', path)
- os.unlink(path)
+ try:
+ os.unlink(path)
+ except FileNotFoundError:
+ pass
if __name__ == '__main__':
