Mercurial > treepkg > treepkg
comparison recipes/kde/enterprise/generic.py @ 514:0c2cc67a29aa
set tag scm types to continous scm types if not set by user
fix error reporting
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Wed, 10 Nov 2010 09:33:36 +0000 |
| parents | e5b66539f893 |
| children | 452c5670ec6b |
comparison
equal
deleted
inserted
replaced
| 513:3e08d6546d52 | 514:0c2cc67a29aa |
|---|---|
| 58 revision_packager_cls = RevisionPackager | 58 revision_packager_cls = RevisionPackager |
| 59 | 59 |
| 60 extra_config_desc = [("tags_url", str, ""), | 60 extra_config_desc = [("tags_url", str, ""), |
| 61 ("tags_pattern", str, ""), | 61 ("tags_pattern", str, ""), |
| 62 ("tags_subdir", str, ""), | 62 ("tags_subdir", str, ""), |
| 63 ("tags_scm_type", str, scm_type), | 63 ("tags_scm_type", str, None), |
| 64 ("tags_rules_url", str, None), | 64 ("tags_rules_url", str, None), |
| 65 ("tags_rules_pattern", str, None), | 65 ("tags_rules_pattern", str, ""), |
| 66 ("tags_rules_subdir", str, ""), | 66 ("tags_rules_subdir", str, ""), |
| 67 ("tags_rules_scm_type", str, rules_scm_type)] | 67 ("tags_rules_scm_type", str, None)] |
| 68 | 68 |
| 69 def __init__(self, *args, **kw): | 69 def __init__(self, *args, **kw): |
| 70 tags_url = kw.pop("tags_url") | 70 tags_url = kw.pop("tags_url") |
| 71 tags_pattern = kw.pop("tags_pattern") | 71 tags_pattern = kw.pop("tags_pattern") |
| 72 tags_subdir = kw.pop("tags_subdir") | 72 tags_subdir = kw.pop("tags_subdir") |
| 73 tags_rules_url = kw.pop("tags_rules_url") | 73 tags_rules_url = kw.pop("tags_rules_url") |
| 74 tags_rules_pattern = kw.pop("tags_rules_pattern", tags_pattern) | 74 tags_rules_pattern = kw.pop("tags_rules_pattern", tags_pattern) |
| 75 tags_rules_subdir = kw.pop("tags_rules_subdir") | 75 tags_rules_subdir = kw.pop("tags_rules_subdir") |
| 76 tags_scm_type = kw.pop("tags_scm_type") | |
| 77 tags_rules_scm_type = kw.pop("tags_rules_scm_type") | |
| 76 super(PackageTrack, self).__init__(*args, **kw) | 78 super(PackageTrack, self).__init__(*args, **kw) |
| 79 | |
| 80 if not tags_scm_type: | |
| 81 tags_scm_type = self.scm_type | |
| 82 if not tags_rules_scm_type: | |
| 83 tags_rules_scm_type = self.rules_scm_type | |
| 84 | |
| 77 if tags_scm_type == "git": | 85 if tags_scm_type == "git": |
| 78 self.tag_detector = git.TagDetector(tags_url, tags_pattern) | 86 self.tag_detector = git.TagDetector(tags_url, tags_pattern) |
| 79 elif tags_scm_type == "svn": | 87 elif tags_scm_type == "svn": |
| 80 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, | 88 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern, |
| 81 tags_subdir) | 89 tags_subdir) |
| 82 else: | 90 else: |
| 83 raise packager.PackageError("Unknown scm type \"%s\" for tag" \ | 91 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ |
| 84 " sources set" % tags_scm_type) | 92 " sources set" % tags_scm_type) |
| 93 | |
| 85 if tags_rules_scm_type == "git": | 94 if tags_rules_scm_type == "git": |
| 86 self.tag_rules_detector = git.TagDetector(tags_rules_url, | 95 self.tag_rules_detector = git.TagDetector(tags_rules_url, |
| 87 tags_rules_pattern) | 96 tags_rules_pattern) |
| 88 elif tags_rules_scm_type == "svn": | 97 elif tags_rules_scm_type == "svn": |
| 89 self.tag_rules_detector = subversion.TagDetector(tags_rules_url, | 98 self.tag_rules_detector = subversion.TagDetector(tags_rules_url, |
| 90 tags_rules_pattern, tags_rules_subdir) | 99 tags_rules_pattern, tags_rules_subdir) |
| 91 else: | 100 else: |
| 92 raise packager.PackageError("Unknown scm type \"%s\" for tag" \ | 101 raise treepkg.packager.PackagerError("Unknown scm type \"%s\" for tag" \ |
| 93 " rules set" % tags_rules_scm_type) | 102 " rules set" % tags_rules_scm_type) |
| 94 self.found_tag_rules = False | 103 self.found_tag_rules = False |
| 95 if tags_rules_url: | 104 if tags_rules_url: |
| 96 self.found_tag_rules = True | 105 self.found_tag_rules = True |
| 97 | 106 |