File reproducible.patch of Package unknown-horizons

Overview Repositories Revisions Requests Users Attributes Meta

File reproducible.patch of Package unknown-horizons (Revision 7879493aa7ffab414569ca660fd92bf0)

Currently displaying revision 7879493aa7ffab414569ca660fd92bf0 , Show latest

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__':

Places

File reproducible.patch of Package unknown-horizons (Revision 7879493aa7ffab414569ca660fd92bf0)

Places