Changeset 88cb50a in rtems-source-builder

Timestamp:

03/06/15 22:19:21 (9 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

55a82ac

Parents:

c4c6264

git-author:

Chris Johns <chrisj@…> (03/06/15 22:19:21)

git-committer:

Chris Johns <chrisj@…> (03/06/15 22:24:51)

Message:

Fix removall for Windows and POSIX file systems.

File:

• source-builder/sb/path.py (modified) (1 diff)

source-builder/sb/path.py

@@ -144 +144 @@
         for name in files:
             file = host(os.path.join(root, name))
-            if not os.access(file, os.W_OK):
+            if not os.path.islink(file) and not os.access(file, os.W_OK):
                 os.chmod(file, stat.S_IWUSR)
             os.unlink(file)
         for name in dirs:
             dir = host(os.path.join(root, name))
-            if not os.access(dir, os.W_OK):
-                os.chmod(dir, stat.S_IWUSR)
-            os.rmdir(dir)
-    if not os.access(path, os.W_OK):
+            if os.path.islink(dir):
+                os.unlink(dir)
+            else:
+                if not os.access(dir, os.W_OK):
+                    os.chmod(dir, stat.S_IWUSR)
+                os.rmdir(dir)
+    if not os.path.islink(path) and not os.access(path, os.W_OK):
         os.chmod(path, stat.S_IWUSR)
-    os.rmdir(path)
+    if os.path.islink(path):
+        os.unlink(path)
+    else:
+        os.rmdir(path)
 
 def expand(name, paths):