Merge pull request #367 from PanDAWMS/next

2.12.6.1

Author: PalNilsson

PILOTVERSION

@@ -1 +1 @@
-2.12.5.4
+2.12.6.1

pilot/util/constants.py

@@ -13,8 +13,8 @@
 # Pilot version
 RELEASE = '2'   # released number should be fixed at 2 for Pilot 2
 VERSION = '12'  # version number is '1' for first real Pilot 2 release, '0' until then, increased for bigger updates
-REVISION = '5'  # revision number should be reset to '1' for every new version release, increased for small updates
-BUILD = '4'     # build number should be reset to '1' for every new development cycle
+REVISION = '6'  # revision number should be reset to '1' for every new version release, increased for small updates
+BUILD = '1'     # build number should be reset to '1' for every new development cycle
 
 SUCCESS = 0
 FAILURE = 1

pilot/util/filehandling.py

@@ -1144,6 +1144,9 @@ def get_disk_usage(start_path='.'):
             fp = os.path.join(dirpath, f)
             # skip if it is symbolic link
             if os.path.exists(fp) and not os.path.islink(fp):
-                total_size += os.path.getsize(fp)
-
+                try:
+                    total_size += os.path.getsize(fp)
+                except Exception as exc:  # change to FileNotFoundError in Pilot 3 for Python 3
+                    logger.warning('caught exception: %s (skipping this file)', exc)
+                    continue
     return total_size