Changeset 478

Timestamp:

05/22/08 10:56:23 (8 months ago)

Author:

jmowery

Message:

fixed reclassifying nodes to properly clean up files in old classification directories

Files:

• branches/trunk-pmd-intproto/server/storage.py (modified) (4 diffs)

branches/trunk-pmd-intproto/server/storage.py

@@ -255 +255 @@
-                '''Remove a directory from control by the store. Note: this removes its entry not its control files unless the directory is "."'''
-                if name == '.':
+                        for x in os.listdir(self.storage_dir):
+                                os.remove(os.path.join(self.storage_dir, x))
-                        os.rmdir(self.storage_dir)
-
+
+
+
+
+
+
-                        os.rmdir(self.nodes_dir)
-                        os.remove(self.status_path)
@@ -1133 +1140 @@
-                self.layers[self.root].config.set('general', 'root', self.root)
-                for b in self.bools.keys():
-
+self.
-                for e in self.entries.keys():
-                        self.layers[os.path.join(os.path.dirname(self.root), self.entries[e].group)].config.set('entries', e, pickle.dumps(self.entries[e]))
@@ -1172 +1179 @@
-                        old_classification = self.classification
-                        old_dirs = self.list_layers()
-_
-_l.storage.path, _
-_
+c
+cl.storage.path, c
+c
-                        new_dirs.append(os.path.join(os.path.dirname(self.root), classification, self.id))
-                        new_dirs.sort()
-                        cl = Layer(os.path.join(os.path.dirname(self.root), classification))
-                        if os.path.basename(old_classification) == self.id:
-
+
+
+
+
+
+
+
+
+
-                        else:
-                                os.mkdir(os.path.join(os.path.dirname(self.root), classification, self.id))
-
+
+
+
-                        for o in old_dirs:
-                                if o not in new_dirs:
@@ -1201 +1217 @@
-                                                self.set_file_status(f, nl.storage.path, 0)
-                                        self.layers[n].write() #create the file
+                                if os.path.basename(nl.name) == self.id:
+                                        nl.entries['.'].type = 'LOCAL'
+                                        nl.modified = True
-                                nl.update()
-                        self.classify()