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

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-04-16 12:59:13 +0200 (Fri, 16 Apr 2010)
New Revision: 286

Modified:
   branches/scratchbox/bin/initpbuilder.py
   branches/scratchbox/bin/treepkgbuilder.py
   branches/scratchbox/test/test_builder.py
   branches/scratchbox/treepkg/builder.py
   branches/scratchbox/treepkg/sbuilder.py
Log:
renamed init_pbuilder method to init_builder


Modified: branches/scratchbox/bin/initpbuilder.py
===================================================================
--- branches/scratchbox/bin/initpbuilder.py	2010-04-16 10:53:30 UTC (rev 285)
+++ branches/scratchbox/bin/initpbuilder.py	2010-04-16 10:59:13 UTC (rev 286)
@@ -48,7 +48,7 @@
                            for opts in packager_opts],
                           **treepkg_opts)
     track = group.get_package_tracks()[0]
-    track.builder.init_pbuilder(distribution=options.distribution,
+    track.builder.init_builder(distribution=options.distribution,
                                 mirrorsite=options.mirrorsite,
                                 extramirrors=options.othermirror)
 

Modified: branches/scratchbox/bin/treepkgbuilder.py
===================================================================
--- branches/scratchbox/bin/treepkgbuilder.py	2010-04-16 10:53:30 UTC (rev 285)
+++ branches/scratchbox/bin/treepkgbuilder.py	2010-04-16 10:59:13 UTC (rev 286)
@@ -76,7 +76,7 @@
 
     def run(self):
         builder = self.get_builder()
-        builder.init_pbuilder(distribution=self.opts.distribution,
+        builder.init_builder(distribution=self.opts.distribution,
                               mirrorsite=self.opts.mirrorsite,
                               extramirrors=self.opts.othermirror)
 

Modified: branches/scratchbox/test/test_builder.py
===================================================================
--- branches/scratchbox/test/test_builder.py	2010-04-16 10:53:30 UTC (rev 285)
+++ branches/scratchbox/test/test_builder.py	2010-04-16 10:59:13 UTC (rev 286)
@@ -44,14 +44,14 @@
 class TestPBuilder(PBuilderTests):
 
     def test_init_pbuilder(self):
-        """Tests the PBuilder.init_pbuilder method."""
+        """Tests the PBuilder.init_builder method."""
         basedir = self.create_temp_dir("pbuilder")
         pbuilderrc = os.path.join(basedir, "pbuilderrc")
         builder = PBuilder(pbuilderrc, self.root_command)
         old_stdout = sys.stdout
         sys.stdout = captured_stdout = StringIO.StringIO()
         try:
-            builder.init_pbuilder(distribution="etch",
+            builder.init_builder(distribution="etch",
                                   mirrorsite="http://example.com/debian",
                                   extramirrors=None)
         finally:
@@ -62,7 +62,7 @@
                                            "aptcache", "extra-pkg"]
                    if not os.path.isdir(os.path.join(basedir, dirname))]
         if missing:
-            self.fail("init_pbuilder did not create these directories: %s"
+            self.fail("init_builder did not create these directories: %s"
                       % " ".join(missing))
 
         # check the pbuilderrc.  This test is a little too strict
@@ -104,7 +104,7 @@
                           % dict(basedir_repr=repr(basedir)[1:-1]))
 
     def test_init_pbuilder_run_twice(self):
-        """Tests whether PBuilder.init_pbuilder prints an error when run twice.
+        """Tests whether PBuilder.init_builder prints an error when run twice.
         """
         basedir = self.create_temp_dir("pbuilder")
 
@@ -114,7 +114,7 @@
         old_stdout = sys.stdout
         sys.stdout = captured_stdout = StringIO.StringIO()
         try:
-            builder.init_pbuilder(distribution="etch",
+            builder.init_builder(distribution="etch",
                                   mirrorsite="http://example.com/debian",
                                   extramirrors=None)
         finally:
@@ -127,7 +127,7 @@
         sys.stderr = captured_stderr = StringIO.StringIO()
         try:
             try:
-                builder.init_pbuilder(distribution="etch",
+                builder.init_builder(distribution="etch",
                                       mirrorsite="http://example.com/debian",
                                       extramirrors=None)
             except SystemExit, exc:

Modified: branches/scratchbox/treepkg/builder.py
===================================================================
--- branches/scratchbox/treepkg/builder.py	2010-04-16 10:53:30 UTC (rev 285)
+++ branches/scratchbox/treepkg/builder.py	2010-04-16 10:59:13 UTC (rev 286)
@@ -108,7 +108,7 @@
         self.release_signing_keyid = release_signing_keyid
         self.base_dir = os.path.dirname(self.pbuilderrc)
 
-    def init_pbuilder(self, distribution, mirrorsite, extramirrors):
+    def init_builder(self, distribution, mirrorsite, extramirrors):
         """Initializes the pbuilder instance"""
         if not os.path.isabs(self.pbuilderrc):
             print >>sys.stderr, "pbuilderrc must be an absolute filename"

Modified: branches/scratchbox/treepkg/sbuilder.py
===================================================================
--- branches/scratchbox/treepkg/sbuilder.py	2010-04-16 10:53:30 UTC (rev 285)
+++ branches/scratchbox/treepkg/sbuilder.py	2010-04-16 10:59:13 UTC (rev 286)
@@ -52,7 +52,7 @@
         self.base_dir = os.path.dirname(self.builderconfig)
         self.mounted_dirs = []
 
-    def init_pbuilder(self, distribution, mirrorsite, extramirrors):
+    def init_builder(self, distribution, mirrorsite, extramirrors):
         """Initializes the builder instance"""
 
         basedir = os.path.dirname(self.pbuilderrc)