Some bugfixes.

Add buildbot.steps.package.dep to install list. Add components to UbuPbuilder.
buildbot · Jul 27, 2012 · bb11c4a · bb11c4a
1 parent 443f3dd
commit bb11c4a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/master/buildbot/steps/package/deb/lintian.py b/master/buildbot/steps/package/deb/lintian.py
@@ -17,10 +17,10 @@
 Steps and objects related to lintian
 """
 
-from buildbot.steps.shell import Test
+from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot import config
 
-class DebLintian(Test):
+class DebLintian(WarningCountingShellCommand):
     name = "lintian"
     description = ["Lintian running"]
     descriptionDone = ["Lintian"]
@@ -41,7 +41,7 @@ def __init__(self, fileloc=None, suppressTags=None, **kwargs):
         @type kwargs: dict
         @param kwargs: all other keyword arguments.
         """
-        Test.__init__(self, **kwargs)
+        WarningCountingShellCommand.__init__(self, **kwargs)
         if fileloc:
             self.fileloc = fileloc
         if suppressTags:

diff --git a/master/buildbot/steps/package/deb/pbuilder.py b/master/buildbot/steps/package/deb/pbuilder.py
@@ -134,7 +134,7 @@ def checkBasetgz(self, cmd):
             if self.extrapackages:
                 command += ['--extrapackages', " ".join(self.extrapackages)]
             if self.keyring:
-                command += ['--debootstrapopt', "--keyring=%s"%self.keyring]
+                command += ['--debootstrapopts', "--keyring=%s"%self.keyring]
             if self.components:
                 command += ['--components', self.components]
 
@@ -192,6 +192,8 @@ class UbuPbuilder(DebPbuilder):
     """Build a Ubuntu package with pbuilder inside of a chroot."""
     mirror = "http://archive.ubuntu.com/ubuntu/"
 
+    components = "main universe"
+
 class UbuCowbuilder(DebCowbuilder):
     """Build a Ubuntu package with cowbuilder inside of a chroot."""
     mirror = "http://archive.ubuntu.com/ubuntu/"

diff --git a/master/buildbot/test/unit/test_steps_package_deb_pbuilder.py b/master/buildbot/test/unit/test_steps_package_deb_pbuilder.py
@@ -191,7 +191,7 @@ def test_keyring(self):
                     '--basetgz', '/var/cache/pbuilder/stable-local-buildbot.tgz',
                     '--distribution', 'stable',
                     '--mirror', 'http://cdn.debian.net/debian/',
-		    '--debootstrapopt', '--keyring=/builbot/buildbot.gpg'])
+		    '--debootstrapopts', '--keyring=/builbot/buildbot.gpg'])
             +0,
             ExpectShell(workdir='wkdir', usePTY='slave-config',
                 command=['pdebuild', '--buildresult', '.',
@@ -297,7 +297,8 @@ def test_new(self):
                 command=['sudo', '/usr/sbin/pbuilder', '--create',
                     '--basetgz', '/var/cache/pbuilder/stable-local-buildbot.tgz',
                     '--distribution', 'stable',
-                    '--mirror', 'http://archive.ubuntu.com/ubuntu/'])
+                    '--mirror', 'http://archive.ubuntu.com/ubuntu/',
+		    '--components', 'main universe'])
             +0,
             ExpectShell(workdir='wkdir', usePTY='slave-config',
                 command=['pdebuild', '--buildresult', '.',

diff --git a/master/setup.py b/master/setup.py
@@ -122,6 +122,7 @@ def make_release_tree(self, base_dir, files):
               "buildbot.changes",
               "buildbot.steps",
               "buildbot.steps.package",
+	      "buildbot.steps.package.deb",
               "buildbot.steps.package.rpm",
               "buildbot.steps.source",
               "buildbot.process",