Mercurial > treepkg
changeset 355:8a07fc5e15b3
added some logging output
reset use_tag_rules
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Wed, 12 May 2010 08:29:52 +0000 |
| parents | 0970a3cca4a6 |
| children | 71524f886550 |
| files | recipes/kde/enterprise/generic.py recipes/kde/maemo/tags.py |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/recipes/kde/enterprise/generic.py Wed May 12 07:10:29 2010 +0000 +++ b/recipes/kde/enterprise/generic.py Wed May 12 08:29:52 2010 +0000 @@ -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()
--- a/recipes/kde/maemo/tags.py Wed May 12 07:10:29 2010 +0000 +++ b/recipes/kde/maemo/tags.py Wed May 12 08:29:52 2010 +0000 @@ -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: