r367 - in branches/rewrite: . src

Otavio Salvador partial-mirror-devel@lists.alioth.debian.org
Tue, 23 Nov 2004 16:13:28 -0700


Author: otavio
Date: Tue Nov 23 16:13:27 2004
New Revision: 367

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Pool.py
Log:
 r374@nurf:  otavio | 2004-11-23T23:09:55.552076Z
 Fix field used to check md5 and handle corrupted files.


Modified: branches/rewrite/src/Pool.py
==============================================================================
--- branches/rewrite/src/Pool.py	(original)
+++ branches/rewrite/src/Pool.py	Tue Nov 23 16:13:27 2004
@@ -39,7 +39,6 @@
         self._dir = FileSystem(backend["mirror_dir"], backend["name"])
         self._server = "%s/" % (self._backend["server"])
         self._local = self._dir._dir + '/'
-        print self._local
         
     def upgrade (self):
         """
@@ -50,12 +49,13 @@
         for pkg in self._backend.getBinaryList().values():
             localName = pkg['Filename']
 
-            if not os.path.exists (os.path.join (self._local,localName)):
+            if not os.path.exists (self._local + localName):
                 self._plist.append(pkg)
-
-            elif self._dir.md5_on (localName) == pkg['md5sum']:
-                    self._gotFiles.append(localName)
+            elif self._dir.md5_on (localName) == pkg['MD5sum']:
+                self._gotFiles.append(localName)
             else:
+                print 'Removing corrupted package', pkg['Package']
+                os.unlink(self._local + localName)
                 self._plist.append(pkg)
 
         self._upgrade ()