ScriptCollection 3.5.116__py3-none-any.whl → 3.5.118__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.116"
+version = "3.5.118"
 __version__ = version
 
 
@@ -474,9 +474,11 @@ class ScriptCollectionCore:
         if pull_first_if_there_are_no_uncommitted_changes:
             uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
             if not uncommitted_changes:
-                self.git_pull(repository_folder, remote, branch, branch)
-                uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
-                GeneralUtilities.assert_condition(not uncommitted_changes, f"Pulling remote \"{remote}\" in \"{repository_folder}\" caused new uncommitted files.")
+                is_pullable: bool = self.git_commit_is_ancestor(repository_folder, branch, f"{remote}/{branch}")
+                if is_pullable:
+                    self.git_pull(repository_folder, remote, branch, branch)
+                    uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+                    GeneralUtilities.assert_condition(not uncommitted_changes, f"Pulling remote \"{remote}\" in \"{repository_folder}\" caused new uncommitted files.")
         self.git_checkout(repository_folder, branch)
         self.git_commit(repository_folder, "Automatic commit due to merge")
         self.git_fetch(repository_folder, remote)
@@ -690,13 +692,12 @@ class ScriptCollectionCore:
     @GeneralUtilities.check_arguments
     def list_content(self, path: str, include_files: bool, include_folder: bool, printonlynamewithoutpath: bool) -> list[str]:
         """This function works platform-independent also for non-local-executions if the ScriptCollection commandline-commands are available as global command on the target-system."""
+        result: list[str] = []
         if self.program_runner.will_be_executed_locally():
-            result = []
             if include_files:
                 result = result + GeneralUtilities.get_direct_files_of_folder(path)
             if include_folder:
                 result = result + GeneralUtilities.get_direct_folders_of_folder(path)
-            return result
         else:
             arguments = ["--path", path]
             if not include_files:
@@ -707,13 +708,13 @@ class ScriptCollectionCore:
                 arguments = arguments+["--printonlynamewithoutpath"]
             exit_code, stdout, stderr, _ = self.run_program_argsasarray("sclistfoldercontent", arguments)
             if exit_code == 0:
-                result: list[str] = []
                 for line in stdout.split("\n"):
                     normalized_line = line.replace("\r", "")
                     result.append(normalized_line)
-                return result
             else:
                 raise ValueError(f"Fatal error occurrs while checking whether file '{path}' exists. StdErr: '{stderr}'")
+        result = [item for item in result if GeneralUtilities.string_has_nonwhitespace_content(item)]
+        return result
 
     @GeneralUtilities.check_arguments
     def is_file(self, path: str) -> bool:

{scriptcollection-3.5.116.dist-info → scriptcollection-3.5.118.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.116
+Version: 3.5.118
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-3.5.116.dist-info → scriptcollection-3.5.118.dist-info}/RECORD

@@ -6,11 +6,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=5qjOBYiliyHV57GY8Y5dgUek512EVI8AzBF288R4fn4,2377
-ScriptCollection/ScriptCollectionCore.py,sha256=mxwraw6MzY2MridnXdqNMIJhyQwKDbmYfioLT23wVlA,131500
+ScriptCollection/ScriptCollectionCore.py,sha256=dzrgJteantFqcasor86q7GnhWyfuXk9QX6oWrFCpegg,131693
 ScriptCollection/TasksForCommonProjectStructure.py,sha256=OfCJsg-FLdde6Duhy4FjBcfwLr-9iLhQAimRa1ZgRyE,234045
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.116.dist-info/METADATA,sha256=EEs50mvJLrn5UXelfeULknJPrW5f-qN8e-KnF81hNew,7694
-scriptcollection-3.5.116.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-scriptcollection-3.5.116.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.116.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.116.dist-info/RECORD,,
+scriptcollection-3.5.118.dist-info/METADATA,sha256=S2GhphsHV1AG2Skb0k11jlesHhedCLWHWUldstjE3Io,7694
+scriptcollection-3.5.118.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+scriptcollection-3.5.118.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.118.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.118.dist-info/RECORD,,