[Treepkg-commits] r270 - in branches/scratchbox: test treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-04-14 16:52:31 +0200 (Wed, 14 Apr 2010)
New Revision: 270

Modified:
   branches/scratchbox/test/test_listpackages.py
   branches/scratchbox/test/test_notifications.py
   branches/scratchbox/test/test_packager.py
   branches/scratchbox/test/test_readconfig.py
   branches/scratchbox/treepkg/packager.py
   branches/scratchbox/treepkg/readconfig.py
Log:
first changes to set builder in PackageTrack class
renamed pbuilderrc variable (from treepkg.cfg) into builderconfig


Modified: branches/scratchbox/test/test_listpackages.py
===================================================================
--- branches/scratchbox/test/test_listpackages.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/test/test_listpackages.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -64,7 +64,7 @@
 [DEFAULT]
 tracks_dir: %(tracksdir)s
 root_cmd: true
-pbuilderrc:
+builderconfig:
 deb_email: packager at example.com
 deb_fullname: Sample Packager
 pkg_revision_template: treepkg%%%%(pkg_revision)d

Modified: branches/scratchbox/test/test_notifications.py
===================================================================
--- branches/scratchbox/test/test_notifications.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/test/test_notifications.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -21,7 +21,7 @@
 [DEFAULT]
 tracks_dir: %(tracksdir)s
 root_cmd: true
-pbuilderrc:
+builderconfig:
 deb_email: packager at example.com
 deb_fullname: Sample Packager
 pkg_revision_template: treepkg%%%%(pkg_revision)d

Modified: branches/scratchbox/test/test_packager.py
===================================================================
--- branches/scratchbox/test/test_packager.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/test/test_packager.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -111,7 +111,7 @@
         rootcmd = os.path.join(os.path.dirname(__file__), os.pardir, "test",
                                "mocksudopbuilder.py")
         track = PackageTrack(name="testpkg", base_dir=self.trackdir,
-                             svn_url=self.svn_url, pbuilderrc="",
+                             svn_url=self.svn_url, builderconfig="",
                              root_cmd=[sys.executable, rootcmd],
                              deb_email="treepkg at example.com",
                              deb_fullname="treepkg tester",
@@ -388,7 +388,7 @@
         defaults = dict(base_dir="/home/builder/tracks/" + name,
                         svn_url="svn://example.com",
                         root_cmd=["false"],
-                        pbuilderrc="/home/builder/pbuilderrc",
+                        builderconfig="/home/builder/pbuilderrc",
                         deb_email="treepkg at example.com", deb_fullname="treepkg",
                         handle_dependencies=handle_dependencies)
         super(PackageTrackWithDependencies,

Modified: branches/scratchbox/test/test_readconfig.py
===================================================================
--- branches/scratchbox/test/test_readconfig.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/test/test_readconfig.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -25,7 +25,7 @@
 tracks_dir: %(treepkg_dir)s/tracks
 root_cmd: sudo
 pbuilder_dir: %(treepkg_dir)s/pbuilder
-pbuilderrc: %(pbuilder_dir)s/pbuilderrc
+builderconfig: %(pbuilder_dir)s/pbuilderrc
 deb_email: treepkg at example.com
 deb_fullname: TreePKG
 pkg_revision_template: treepkg%%(pkg_revision)d
@@ -95,7 +95,7 @@
                  pkg_revision_template="treepkg%(pkg_revision)d",
                  handle_dependencies=False,
                  packager_class="readconfig_test.extraargs",
-                 pbuilderrc="/home/builder/mill/pbuilder/pbuilderrc",
+                 builderconfig="/home/builder/mill/pbuilder/pbuilderrc",
                  # pkg_basename is passed as an empty string by default.
                  # The PackageTrack an empty pkg_basename it with the
                  # value of name
@@ -122,7 +122,7 @@
                  pkg_revision_template="treepkg%(pkg_revision)d",
                  handle_dependencies=True,
                  packager_class="readconfig_test.simple",
-                 pbuilderrc="/home/builder/mill/pbuilder/pbuilderrc",
+                 builderconfig="/home/builder/mill/pbuilder/pbuilderrc",
                  pkg_basename="simple1",
                  root_cmd=['sudo'],
                  signing_key_id="abcd1234",

Modified: branches/scratchbox/treepkg/packager.py
===================================================================
--- branches/scratchbox/treepkg/packager.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/treepkg/packager.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -342,11 +342,13 @@
 
     revision_packager_cls = RevisionPackager
 
+    builder_cls = PBuilder
+
     svn_external_subdirs = []
 
     extra_config_desc = []
 
-    def __init__(self, name, base_dir, root_cmd, pbuilderrc, deb_email,
+    def __init__(self, name, base_dir, root_cmd, builderconfig, deb_email,
                  deb_fullname, svn_url="", packager_class="treepkg.packager",
                  version_template="%(revision)s",
                  pkg_revision_template="treepkg%(pkg_revision)d",
@@ -360,7 +362,7 @@
         self.pkg_basename = pkg_basename
         self.changelog_msg_template = changelog_msg_template
         self.base_dir = base_dir
-        self.builder = PBuilder(pbuilderrc, root_cmd,
+        self.builder = self.builder_cls(builderconfig, root_cmd,
                                 release_signing_keyid=signing_key_id)
         self.deb_email = deb_email
         self.deb_fullname = deb_fullname

Modified: branches/scratchbox/treepkg/readconfig.py
===================================================================
--- branches/scratchbox/treepkg/readconfig.py	2010-04-14 13:17:30 UTC (rev 269)
+++ branches/scratchbox/treepkg/readconfig.py	2010-04-14 14:52:31 UTC (rev 270)
@@ -69,7 +69,7 @@
     ("svn_subset", convert_subversion_subset, ""),
     ("svn_externals", shlex.split, ""),
     ("rules_svn_url", str, ""), "packager_class",
-    ("root_cmd", shlex.split, "sudo"), "pbuilderrc",
+    ("root_cmd", shlex.split, "sudo"), "builderconfig",
     "deb_email", "deb_fullname", ("deb_build_options", str, ""),
     ("version_template", str, "%(revision)s"),
     "pkg_revision_template", ("pkg_basename", str, ""),