[Treepkg-commits] r311 - in trunk/recipes/kde: enterprise maemo

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-05-12 10:29:52 +0200 (Wed, 12 May 2010)
New Revision: 311

Modified:
   trunk/recipes/kde/enterprise/generic.py
   trunk/recipes/kde/maemo/tags.py
Log:
added some logging output
reset use_tag_rules


Modified: trunk/recipes/kde/enterprise/generic.py
===================================================================
--- trunk/recipes/kde/enterprise/generic.py	2010-05-12 07:10:29 UTC (rev 310)
+++ trunk/recipes/kde/enterprise/generic.py	2010-05-12 08:29:52 UTC (rev 311)
@@ -66,18 +66,20 @@
                                                    tags_subdir)
         self.tag_rules_detector = subversion.TagDetector(tags_url, tags_pattern,
                                                    tags_rules_subdir)
-        self.use_tag_rules = False
+        self.found_tag_rules = False
         if tags_rules_subdir:
-            self.use_tag_rules = True
+            self.found_tag_rules = True
 
     def packager_for_new_revision(self):
         logging.info("Checking tags")
         self.tag_url = None
+        self.use_tag_rules = self.found_tag_rules
         tag_url, tag_revision = self.tag_detector.newest_tag_revision()
         tag_rules_url, tag_rules_revision = self.tag_rules_detector.newest_tag_revision()
         logging.info("Found: %s: %s", tag_url, tag_revision)
+        logging.info("Found rules: %s: %s", tag_rules_url, tag_rules_revision)
         if self.use_tag_rules and tag_rules_url is None:
-            self.use_tag_rules = False
+            self.use_tag_rules = False # maybe it's better to raise an exception
         if tag_url is not None:
             if not self.use_tag_rules:
                 tag_rules_revision = self.rules_working_copy.last_changed_revision()

Modified: trunk/recipes/kde/maemo/tags.py
===================================================================
--- trunk/recipes/kde/maemo/tags.py	2010-05-12 07:10:29 UTC (rev 310)
+++ trunk/recipes/kde/maemo/tags.py	2010-05-12 08:29:52 UTC (rev 311)
@@ -81,16 +81,18 @@
                                                    tags_subdir)
         self.tag_rules_detector = subversion.TagDetector(tags_url, tags_pattern,
                                                    tags_rules_subdir)
-        self.use_tag_rules = False
+        self.found_tag_rules = False
         if tags_rules_subdir:
-            self.use_tag_rules = True
+            self.found_tag_rules = True
 
     def packager_for_new_revision(self):
         logging.info("Checking tags")
         self.tag_url = None
+		self.use_tag_rules = self.found_tag_rules
         tag_url, tag_revision = self.tag_detector.newest_tag_revision()
         tag_rules_url, tag_rules_revision = self.tag_rules_detector.newest_tag_revision()
         logging.info("Found: %s: %s", tag_url, tag_revision)
+		logging.info("Found rules: %s: %s", tag_rules_url, tag_rules_revision)
         if self.use_tag_rules and tag_rules_url is None:
             self.use_tag_rules = False
         if tag_url is not None: