conan 2.25.0__tar.gz → 2.25.1__tar.gz

{conan-2.25.0/conan.egg-info → conan-2.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan
-Version: 2.25.0
+Version: 2.25.1
 Summary: Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan-2.25.0 → conan-2.25.1}/conan/__init__.py

@@ -2,5 +2,5 @@ from conan.internal.model.conan_file import ConanFile
 from conan.internal.model.workspace import Workspace
 from conan.internal.model.version import Version
 
-__version__ = '2.25.0'
+__version__ = '2.25.1'
 conan_version = Version(__version__)

{conan-2.25.0 → conan-2.25.1}/conan/internal/util/files.py

@@ -16,15 +16,6 @@ from conan.errors import ConanException
 _DIRTY_FOLDER = ".dirty"
 
 
-def atomic_replace(src, dst, item):
-    try:
-        os.replace(src, dst)  # ATOMIC!!!
-    except OSError as e:
-        msg = ("The os.replace() to put this item in the package storage has failed. Maybe"
-               f"there was a concurrent process that did it first.\n    Item: {item}\n    Msg: {e}")
-        ConanOutput().warning(msg)
-
-
 def set_dirty(folder):
     dirty_file = os.path.normpath(folder) + _DIRTY_FOLDER
     assert not os.path.exists(dirty_file), "Folder '{}' is already dirty".format(folder)
@@ -193,6 +184,24 @@ def _change_permissions(func, path, exc_info):
 
 
 if platform.system() == "Windows":
+    def atomic_replace(src, dst, item):
+        retries = 3
+        delay = 0.5
+        for i in range(retries):
+            try:
+                os.replace(src, dst)  # ATOMIC!!!
+                return
+            except OSError as e:
+                msg = ("The os.replace() to put this item in the package storage has failed.\n"
+                       "If you have an antivirus, try to exclude the "
+                       "Conan cache from the antivirus software."
+                       f"    Item: {item}\n    Error: {e}")
+                if i == retries - 1:
+                    raise ConanException(msg)
+                ConanOutput().warning(msg)
+                time.sleep(delay)
+
+
     def rmdir(path):
         if not os.path.isdir(path):
             return
@@ -226,6 +235,16 @@ if platform.system() == "Windows":
                                          "Close any app using it and retry.")
                 time.sleep(delay)
 else:
+    def atomic_replace(src, dst, item):
+        try:
+            os.replace(src, dst)  # ATOMIC!!!
+        except OSError as e:
+            msg = ("The os.replace() to put this item in the package storage has failed. Maybe"
+                   f"there was a concurrent process that did it first.\n"
+                   f"    Item: {item}\n    Msg: {e}")
+            raise ConanException(msg)
+
+
     def rmdir(path):
         if not os.path.isdir(path):
             return

{conan-2.25.0 → conan-2.25.1/conan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan
-Version: 2.25.0
+Version: 2.25.1
 Summary: Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD