From 7c723753e6e366e15282a279b02e6fa9e1789c99 Mon Sep 17 00:00:00 2001 From: Julian Taylor Date: Fri, 4 Mar 2011 00:12:01 +0100 Subject: [PATCH] simpler implementation of cowbuilder support --- ubuntutools/builder.py | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/ubuntutools/builder.py b/ubuntutools/builder.py index df42810..9cbfc0e 100644 --- a/ubuntutools/builder.py +++ b/ubuntutools/builder.py @@ -55,9 +55,9 @@ class Builder(object): class Pbuilder(Builder): - def __init__(self): + def __init__(self, command="pbuilder"): Builder.__init__(self, "pbuilder") - self.command = "pbuilder" + self.command = command def build(self, dsc_file, dist, result_directory): _build_preparation(result_directory) @@ -79,9 +79,9 @@ class Pbuilder(Builder): class Pbuilderdist(Builder): - def __init__(self): + def __init__(self, command="pbuilder-dist"): Builder.__init__(self, "pbuilder-dist") - self.command = "pbuilder-dist" + self.command = command def build(self, dsc_file, dist, result_directory): _build_preparation(result_directory) @@ -98,18 +98,6 @@ class Pbuilderdist(Builder): 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): def __init__(self): Builder.__init__(self, "sbuild") @@ -165,9 +153,9 @@ def get_builder(builder): elif builder == 'pbuilder-dist': return Pbuilderdist() elif builder == 'cowbuilder': - return Cowbuilder() + return Pbuilder("cowbuilder") elif builder == 'cowbuilder-dist': - return Cowbuilderdist() + return Pbuilderdist("cowbuilder-dist") elif builder == 'sbuild': return Sbuild()