Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Builder.name instead of _command for the pbuilder builders

Browse Source
This commit is contained in:
Stefano Rivera 2011-07-25 15:20:27 +02:00
parent 9357415020
commit b4a6cf5310
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ubuntutools/builder.py
View File

@ -55,14 +55,13 @@ class Builder(object):
class Pbuilder(Builder): class Pbuilder(Builder):
def __init__(self, command="pbuilder"): def __init__(self, name="pbuilder"):
Builder.__init__(self, "pbuilder") Builder.__init__(self, name)
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)
cmd = ["sudo", "-E", "ARCH=" + self.architecture, "DIST=" + dist, cmd = ["sudo", "-E", "ARCH=" + self.architecture, "DIST=" + dist,
self._command, "--build", self.name, "--build",
"--architecture", self.architecture, "--distribution", dist, "--architecture", self.architecture, "--distribution", dist,
"--buildresult", result_directory, dsc_file] "--buildresult", result_directory, dsc_file]
Logger.command(cmd) Logger.command(cmd)
@ -71,7 +70,7 @@ class Pbuilder(Builder):
def update(self, dist): def update(self, dist):
cmd = ["sudo", "-E", "ARCH=" + self.architecture, "DIST=" + dist, cmd = ["sudo", "-E", "ARCH=" + self.architecture, "DIST=" + dist,
self._command, "--update", self.name, "--update",
"--architecture", self.architecture, "--distribution", dist] "--architecture", self.architecture, "--distribution", dist]
Logger.command(cmd) Logger.command(cmd)
returncode = subprocess.call(cmd) returncode = subprocess.call(cmd)
@ -79,20 +78,19 @@ class Pbuilder(Builder):
class Pbuilderdist(Builder): class Pbuilderdist(Builder):
def __init__(self, command="pbuilder-dist"): def __init__(self, name="pbuilder-dist"):
Builder.__init__(self, "pbuilder-dist") Builder.__init__(self, name)
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)
cmd = [self._command, dist, self.architecture, cmd = [self.name, dist, self.architecture,
"build", dsc_file, "--buildresult", result_directory] "build", dsc_file, "--buildresult", result_directory]
Logger.command(cmd) Logger.command(cmd)
returncode = subprocess.call(cmd) returncode = subprocess.call(cmd)
return self._build_failure(returncode, dsc_file) return self._build_failure(returncode, dsc_file)
def update(self, dist): def update(self, dist):
cmd = [self._command, dist, self.architecture, "update"] cmd = [self.name, dist, self.architecture, "update"]
Logger.command(cmd) Logger.command(cmd)
returncode = subprocess.call(cmd) returncode = subprocess.call(cmd)
return self._update_failure(returncode, dist) return self._update_failure(returncode, dist)