diff treepkg/readconfig.py @ 389:a690fc689f2f treepkg-status

added treepkg_dir andd tracks_dir attributes to PackageGroup
author Bjoern Ricks <bricks@intevation.de>
date Thu, 08 Jul 2010 15:59:52 +0000
parents c1f3be727f9d
children 89ecca5d262e
line wrap: on
line diff
--- a/treepkg/readconfig.py	Thu Jul 08 13:25:07 2010 +0000
+++ b/treepkg/readconfig.py	Thu Jul 08 15:59:52 2010 +0000
@@ -84,7 +84,9 @@
 treepkg_desc = [
     ("check_interval", int),
     "instructions_file",
-    ("name", str, "")
+    ("name", str, ""),
+    ("treepkg_dir", str, None),
+    ("tracks_dir", str, None)
     ]
 
 
@@ -134,8 +136,8 @@
             packager_class = parser.get(section, "packager_class", vars=vars)
             module = packager.import_packager_module(packager_class)
             desc = packager_desc + module.PackageTrack.extra_config_desc
-            packager_options = (read_config_section(parser, section, desc,
-                                                    defaults=vars))
+            packager_options = read_config_section(parser, section, desc,
+                                                    defaults=vars)
             if not packager_options.get("svn_url") \
             and not packager_options.get('git_url'):
                 print >>sys.stderr, "Missing repository URL in section %r" \
@@ -146,8 +148,7 @@
                 print >>sys.stderr, \
                       "Warning: git_url in section %r will be ignored" \
                        % (section)
-            packagers.append(read_config_section(parser, section, desc,
-                                                 defaults=vars))
+            packagers.append(packager_options)
 
     # main config
     treepkg = read_config_section(parser, "treepkg", treepkg_desc)
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)