[Treepkg-commits] r485 - trunk/recipes/kde/enterprise

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-11-11 09:26:32 +0100 (Thu, 11 Nov 2010)
New Revision: 485

Modified:
   trunk/recipes/kde/enterprise/generic.py
Log:
set the correct tags_rules_pattern if not provided in the config
kw.pop with a default value doesn't work with empty strings


Modified: trunk/recipes/kde/enterprise/generic.py
===================================================================
--- trunk/recipes/kde/enterprise/generic.py	2010-11-10 16:48:03 UTC (rev 484)
+++ trunk/recipes/kde/enterprise/generic.py	2010-11-11 08:26:32 UTC (rev 485)
@@ -71,12 +71,14 @@
         tags_pattern = kw.pop("tags_pattern")
         tags_subdir = kw.pop("tags_subdir")
         tags_rules_url = kw.pop("tags_rules_url")
-        tags_rules_pattern = kw.pop("tags_rules_pattern", tags_pattern)
+        tags_rules_pattern = kw.pop("tags_rules_pattern")
         tags_rules_subdir = kw.pop("tags_rules_subdir")
         tags_scm_type = kw.pop("tags_scm_type")
         tags_rules_scm_type = kw.pop("tags_rules_scm_type")
         super(PackageTrack, self).__init__(*args, **kw)
 
+        if not tags_rules_pattern:
+            tags_rules_pattern = tags_pattern
         if not tags_scm_type:
             tags_scm_type = self.scm_type
         if not tags_rules_scm_type: