try patching differently

Devolutions · Feb 6, 2024 · c992342 · c992342
1 parent b8a48e9
commit c992342
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/recipes/openssh/conanfile.py b/recipes/openssh/conanfile.py
@@ -39,15 +39,17 @@ def source(self):
         git.clone(self.url)
         git.checkout(self.branch)
 
-        git = tools.Git(folder="openssh-distro")
-        git.clone("https://github.com/Devolutions/openssh-distro")
-        git.checkout('openssh-update')
+        git_distro = tools.Git(folder="openssh-distro")
+        git_distro.clone("https://github.com/Devolutions/openssh-distro")
+        git_distro.checkout('openssh-update')
         version_dir = 'v%s' % (self.version)
-        patches_dir = os.path.join("openssh-distro", "patches", version_dir)
+        patches_dir = os.path.join(os.getcwd(), "openssh-distro", "patches", version_dir)
         if os.path.isdir(patches_dir):
-            for patch_file in sorted([f for f in os.listdir(patches_dir) if f.endswith('.patch')]):
+            patch_files = sorted([f for f in os.listdir(patches_dir) if f.endswith('.patch')])
+            for patch_file in patch_files:
                 patch_path = os.path.join(patches_dir, patch_file)
-                tools.patch(base_path=folder, patch_file=patch_path)
+                git_cmd = 'am --whitespace=nowarn %s' % (patch_path)
+                git.run(git_cmd)
 
     def build(self):
         cmake = CMake(self)