Mercurial > treepkg > treepkg
comparison recipes/kde/enterprise/generic.py @ 518:452c5670ec6b
fix git tag detector usage in enterprise packager
working copy paths were missing
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Wed, 10 Nov 2010 13:32:37 +0000 |
| parents | 0c2cc67a29aa |
| children | 7af344f9e704 |
comparison
equal
deleted
inserted
replaced
| 517:de78084fcbce | 518:452c5670ec6b |
|---|---|
| 81 tags_scm_type = self.scm_type | 81 tags_scm_type = self.scm_type |
| 82 if not tags_rules_scm_type: | 82 if not tags_rules_scm_type: |
| 83 tags_rules_scm_type = self.rules_scm_type | 83 tags_rules_scm_type = self.rules_scm_type |
| 84 | 84 |
| 85 if tags_scm_type == "git": | 85 if tags_scm_type == "git": |
| 86 self.tag_detector = git.TagDetector(tags_url, tags_pattern) | 86 self.tag_detector = git.TagDetector(tags_url, tags_pattern, |
| 87 self.checkout_dir) | |
| 87 elif tags_scm_type == "svn": | 88 elif tags_scm_type == "svn": |
| 88 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, | 89 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, |
| 89 tags_subdir) | 90 tags_subdir) |
| 90 else: | 91 else: |
| 91 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ | 92 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ |
| 92 " sources set" % tags_scm_type) | 93 " sources set" % tags_scm_type) |
| 93 | 94 |
| 94 if tags_rules_scm_type == "git": | 95 if tags_rules_scm_type == "git": |
| 95 self.tag_rules_detector = git.TagDetector(tags_rules_url, | 96 self.tag_rules_detector = git.TagDetector(tags_rules_url, |
| 96 tags_rules_pattern) | 97 tags_rules_pattern, self.debian_dir) |
| 97 elif tags_rules_scm_type == "svn": | 98 elif tags_rules_scm_type == "svn": |
| 98 self.tag_rules_detector = subversion.TagDetector(tags_rules_url, | 99 self.tag_rules_detector = subversion.TagDetector(tags_rules_url, |
| 99 tags_rules_pattern, tags_rules_subdir) | 100 tags_rules_pattern, tags_rules_subdir) |
| 100 else: | 101 else: |
| 101 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ | 102 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ |