Mercurial > treepkg
comparison recipes/kde/enterprise/generic.py @ 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 | eb6445552640 |
comparison
equal
deleted
inserted
replaced
| 354:0970a3cca4a6 | 355:8a07fc5e15b3 |
|---|---|
| 64 super(PackageTrack, self).__init__(*args, **kw) | 64 super(PackageTrack, self).__init__(*args, **kw) |
| 65 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, | 65 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, |
| 66 tags_subdir) | 66 tags_subdir) |
| 67 self.tag_rules_detector = subversion.TagDetector(tags_url, tags_pattern, | 67 self.tag_rules_detector = subversion.TagDetector(tags_url, tags_pattern, |
| 68 tags_rules_subdir) | 68 tags_rules_subdir) |
| 69 self.use_tag_rules = False | 69 self.found_tag_rules = False |
| 70 if tags_rules_subdir: | 70 if tags_rules_subdir: |
| 71 self.use_tag_rules = True | 71 self.found_tag_rules = True |
| 72 | 72 |
| 73 def packager_for_new_revision(self): | 73 def packager_for_new_revision(self): |
| 74 logging.info("Checking tags") | 74 logging.info("Checking tags") |
| 75 self.tag_url = None | 75 self.tag_url = None |
| 76 self.use_tag_rules = self.found_tag_rules | |
| 76 tag_url, tag_revision = self.tag_detector.newest_tag_revision() | 77 tag_url, tag_revision = self.tag_detector.newest_tag_revision() |
| 77 tag_rules_url, tag_rules_revision = self.tag_rules_detector.newest_tag_revision() | 78 tag_rules_url, tag_rules_revision = self.tag_rules_detector.newest_tag_revision() |
| 78 logging.info("Found: %s: %s", tag_url, tag_revision) | 79 logging.info("Found: %s: %s", tag_url, tag_revision) |
| 80 logging.info("Found rules: %s: %s", tag_rules_url, tag_rules_revision) | |
| 79 if self.use_tag_rules and tag_rules_url is None: | 81 if self.use_tag_rules and tag_rules_url is None: |
| 80 self.use_tag_rules = False | 82 self.use_tag_rules = False # maybe it's better to raise an exception |
| 81 if tag_url is not None: | 83 if tag_url is not None: |
| 82 if not self.use_tag_rules: | 84 if not self.use_tag_rules: |
| 83 tag_rules_revision = self.rules_working_copy.last_changed_revision() | 85 tag_rules_revision = self.rules_working_copy.last_changed_revision() |
| 84 revision = (tag_revision, tag_rules_revision) | 86 revision = (tag_revision, tag_rules_revision) |
| 85 logging.info("New revision is %s", revision) | 87 logging.info("New revision is %s", revision) |