[Treepkg-commits] r405 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2010-08-09 14:25:41 +0200 (Mon, 09 Aug 2010)
New Revision: 405

Modified:
   trunk/treepkg/readconfig.py
Log:
Default to treepkg.packager if no packager class is given


Modified: trunk/treepkg/readconfig.py
===================================================================
--- trunk/treepkg/readconfig.py	2010-08-09 12:24:56 UTC (rev 404)
+++ trunk/treepkg/readconfig.py	2010-08-09 12:25:41 UTC (rev 405)
@@ -69,7 +69,7 @@
     ("svn_url", str,""),
     ("svn_subset", convert_subversion_subset, ""),
     ("svn_externals", shlex.split, ""),
-    ("rules_svn_url", str, ""), "packager_class",
+    ("rules_svn_url", str, ""), ("packager_class", str, "treepkg.packager"),
     ("root_cmd", shlex.split, "sudo"), "builderconfig",
     "deb_email", "deb_fullname", ("deb_build_options", str, ""),
     ("version_template", str, "%(revision)s"),
@@ -138,7 +138,11 @@
     for section in parser.sections():
         if section.startswith("pkg_"):
             vars = dict(name=section[4:])
-            packager_class = parser.get(section, "packager_class", vars=vars)
+            try:
+                packager_class = parser.get(section, "packager_class",
+                                            vars=vars)
+            except NoOptionError:
+                packager_class = "treepkg.packager"
             module = packager.import_packager_module(packager_class)
             desc = packager_desc + module.PackageTrack.extra_config_desc
             packager_options = read_config_section(parser, section, desc,