simpler implementation of cowbuilder support

This commit is contained in:
Julian Taylor 2011-03-04 00:12:01 +01:00
parent 73518f83b5
commit 7c723753e6

View File

@ -55,9 +55,9 @@ class Builder(object):
class Pbuilder(Builder): class Pbuilder(Builder):
def __init__(self): def __init__(self, command="pbuilder"):
Builder.__init__(self, "pbuilder") Builder.__init__(self, "pbuilder")
self.command = "pbuilder" self.command = command
def build(self, dsc_file, dist, result_directory): def build(self, dsc_file, dist, result_directory):
_build_preparation(result_directory) _build_preparation(result_directory)
@ -79,9 +79,9 @@ class Pbuilder(Builder):
class Pbuilderdist(Builder): class Pbuilderdist(Builder):
def __init__(self): def __init__(self, command="pbuilder-dist"):
Builder.__init__(self, "pbuilder-dist") Builder.__init__(self, "pbuilder-dist")
self.command = "pbuilder-dist" self.command = command
def build(self, dsc_file, dist, result_directory): def build(self, dsc_file, dist, result_directory):
_build_preparation(result_directory) _build_preparation(result_directory)
@ -98,18 +98,6 @@ class Pbuilderdist(Builder):
return self._update_failure(returncode, dist) return self._update_failure(returncode, dist)
class Cowbuilder(Pbuilder):
def __init__(self):
Builder.__init__(self, "cowbuilder")
self.command = "cowbuilder"
class Cowbuilderdist(Pbuilderdist):
def __init__(self):
Builder.__init__(self, "cowbuilder-dist")
self.command = "cowbuilder-dist"
class Sbuild(Builder): class Sbuild(Builder):
def __init__(self): def __init__(self):
Builder.__init__(self, "sbuild") Builder.__init__(self, "sbuild")
@ -165,9 +153,9 @@ def get_builder(builder):
elif builder == 'pbuilder-dist': elif builder == 'pbuilder-dist':
return Pbuilderdist() return Pbuilderdist()
elif builder == 'cowbuilder': elif builder == 'cowbuilder':
return Cowbuilder() return Pbuilder("cowbuilder")
elif builder == 'cowbuilder-dist': elif builder == 'cowbuilder-dist':
return Cowbuilderdist() return Pbuilderdist("cowbuilder-dist")
elif builder == 'sbuild': elif builder == 'sbuild':
return Sbuild() return Sbuild()