Changeset 101

Timestamp:

07/22/06 11:49:34 (2 years ago)

Author:

mk

Message:

Fixed a bug in IndexRequiredFiles? compute method (thanks to Will Guaraldi for report and solution).

Files:

• branches/mk/cheesecake/cheesecake_index.py (modified) (5 diffs)

branches/mk/cheesecake/cheesecake_index.py

@@ -352 +352 @@
-    value = -1
-    details = ""
-advices
+info
-
-    def __init__(self, *indices):
@@ -497 +497 @@
-        return self._indices_dict[name]
-
-advices
+info
-        if self.subindices:
-advices
-advices
+info
+info
-
-################################################################################
@@ -783 +783 @@
-
-    def compute(self, files_list, dirs_list, package_dir):
+        # Inform user of files and directories the package is missing.
+        def make_info(dictionary, what):
+            missing = self.get_not_used(dictionary.keys())
+            importance = {30: ' critical', 20: ' important', 10: ''}
+            info = []
+
+            positive_msg = "[%s] Package has%s %s: %s.\n"
+            negative_msg = "[%s] Package doesn't have%s %s: %s.\n"
+
+            for key in dictionary.keys():
+                msg = positive_msg
+                if key in missing:
+                    msg = negative_msg
+                info.append(msg % (index_class_to_name(self.name), importance[dictionary[key]], what, str(key)))
+
+            return ''.join(info)
+
+        # Compute required files.
-        files_count, files_value = self._compute_from_rules(files_list, package_dir, self.cheese_files)
+        self.info = make_info(self.cheese_files, 'file')
+
+        # Compute required directories.
-        dirs_count, dirs_value = self._compute_from_rules(dirs_list, package_dir, self.cheese_dirs)
+        self.info += make_info(self.cheese_dirs, 'directory')
-
-        self.value = files_value + dirs_value
@@ -790 +812 @@
-        self.details = "%d files and %d required directories found" % \
-                       (files_count, dirs_count)
-
-        # Inform user of files and directories the package is missing.
-        def make_advices(dictionary, what):
-            missing = self.get_not_used(dictionary.keys())
-            importance = {30: ' critical', 20: ' important', 10: ''}
-            return ''.join(map(lambda miss: "Package don't have%s %s: %s.\n" % \
-                                 (importance[dictionary[miss]], what, str(miss)),
-                                 missing))
-
-        self.advices = make_advices(self.cheese_files, 'file') +\
-                       make_advices(self.cheese_dirs, 'directory')
-
-        return self.value
@@ -1537 +1548 @@
-            if self.verbose:
-                print
-advices
+info
-
-        return cheesecake_index