[Oval-commits] r151 - trunk/oval-server/src/dsaSync

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-19 18:37:22 +0000 (Sun, 19 Aug 2007)
New Revision: 151

Modified:
   trunk/oval-server/src/dsaSync/directory.py
   trunk/oval-server/src/dsaSync/sync.py
Log:
Fix stat usage in directory sync

Modified: trunk/oval-server/src/dsaSync/directory.py
===================================================================
--- trunk/oval-server/src/dsaSync/directory.py	2007-08-19 18:27:17 UTC (rev 150)
+++ trunk/oval-server/src/dsaSync/directory.py	2007-08-19 18:37:22 UTC (rev 151)
@@ -1,6 +1,6 @@
 from sync import DsaSync
 from datetime import datetime
-from shutil import copyfile
+from shutil import copy2
 from stat import *
 import os
 
@@ -30,12 +30,12 @@
 			path = self.dsaStorage + os.sep + dir
 			
 			if os.access(path, os.W_OK) and os.path.isdir (path):
-				copyfile ('%s/%s/%s' % (self.dsaSource, dir, file), path+os.sep+file)
+				copy2 ('%s/%s/%s' % (self.dsaSource, dir, file), path+os.sep+file)
 			else:
 				os.mkdir(path)
 				self.syncfile(dir, file)
 		else:
-			copyfile ('%s/%s' % (self.dsaSource, file), self.dsaStorage+os.sep+file)
+			copy2 ('%s/%s' % (self.dsaSource, file), self.dsaStorage+os.sep+file)
 				
 	def syncdirs (self):
 		#Move this function to parrent

Modified: trunk/oval-server/src/dsaSync/sync.py
===================================================================
--- trunk/oval-server/src/dsaSync/sync.py	2007-08-19 18:27:17 UTC (rev 150)
+++ trunk/oval-server/src/dsaSync/sync.py	2007-08-19 18:37:22 UTC (rev 151)
@@ -21,7 +21,7 @@
 		if (os.access(self.dsaStorage, os.R_OK)):
 			for path in os.listdir(self.dsaStorage):
 				mtime = datetime.fromtimestamp(os.stat(self.dsaStorage+os.sep+path)[ST_MTIME])
-				if mtime > time:
+				if mtime > time and os.path.isfile(path):
 					time = mtime
 		else:
 			os.mkdir(self.dsaStorage)