Added better "access denied" handling in msi_cleanup.py

msi_cleanup.py

@@ -30,6 +30,7 @@
 from common_helpers import MB
 import os
 import glob
+import errno
 
 def getCachedMsiFiles(ext):
     '''
@@ -72,8 +73,17 @@ def orphanCleanup(name, ext, enumerator):
             for orphan in orphanFiles:
                 try:
                     os.remove(orphan)
-                except Exception, e:
-                    print 'Cannot remove "%s": %r' % (orphan, e)
+                except OSError as ex:
+                    if ex.errno == errno.EACCES:
+                        reason = 'access denied'
+                    else:
+                        reason = '%s <%r>' % (ex, ex)
+                except BaseException as ex:
+                    reason = '%s <%r>' % (ex, ex)
+                else:
+                    reason = ''
+                if reason:
+                    print 'Cannot remove "%s": %s' % (orphan, reason)
         else:
             print 'Cancelled by user'
     else:

msi_helpers.py

@@ -25,7 +25,6 @@
 import ctypes
 from ctypes.wintypes import DWORD
 from ctypes import c_char_p, POINTER, c_uint, pointer
-from win32elevate import elevateAdminRights
 
 LPDWORD = POINTER(DWORD)
 
@@ -153,5 +152,5 @@ def getAllProducts():
         yield MsiProduct(productGuid.value)
 
 if __name__ == '__main__':
-    sys.stderr.write('This is helper module not intended for standalone run\n')
-    sys.exit(1)
+    import sys
+    sys.exit('This is helper module not intended for standalone run\n')