Mercurial > treepkg
comparison recipes/kde/enterprise/generic.py @ 522:7af344f9e704
set the correct tags_rules_pattern if not provided in the config
kw.pop with a default value doesn't work with empty strings
| author | Bjoern Ricks <bricks@intevation.de> |
|---|---|
| date | Thu, 11 Nov 2010 08:26:32 +0000 |
| parents | 452c5670ec6b |
| children | 10a7fed8bf80 |
comparison
equal
deleted
inserted
replaced
| 521:d26642ed6afa | 522:7af344f9e704 |
|---|---|
| 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") |
| 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") | 76 tags_scm_type = kw.pop("tags_scm_type") |
| 77 tags_rules_scm_type = kw.pop("tags_rules_scm_type") | 77 tags_rules_scm_type = kw.pop("tags_rules_scm_type") |
| 78 super(PackageTrack, self).__init__(*args, **kw) | 78 super(PackageTrack, self).__init__(*args, **kw) |
| 79 | 79 |
| 80 if not tags_rules_pattern: | |
| 81 tags_rules_pattern = tags_pattern | |
| 80 if not tags_scm_type: | 82 if not tags_scm_type: |
| 81 tags_scm_type = self.scm_type | 83 tags_scm_type = self.scm_type |
| 82 if not tags_rules_scm_type: | 84 if not tags_rules_scm_type: |
| 83 tags_rules_scm_type = self.rules_scm_type | 85 tags_rules_scm_type = self.rules_scm_type |
| 84 | 86 |