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

Fix indentation and formatting of previous commit.

Browse Source
This commit is contained in:
Benjamin Drung 2010-12-17 13:56:36 +01:00
parent 1747986a88
commit 6aafc793dd
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -17,7 +17,7 @@ ubuntu-dev-tools (0.108) UNRELEASED; urgency=low
[ Bilal Akhtar ] [ Bilal Akhtar ]
* pbuilder-dist: Override the default build result location if * pbuilder-dist: Override the default build result location if
--buildresult is specified. --buildresult is specified.
-- Benjamin Drung <bdrung@ubuntu.com> Thu, 16 Dec 2010 23:40:14 +0100 -- Benjamin Drung <bdrung@ubuntu.com> Thu, 16 Dec 2010 23:40:14 +0100

12
pbuilder-dist
View File

@ -177,13 +177,13 @@ class pbuilder_dist:
+ self.build_architecture) + self.build_architecture)
prefix = os.path.join(self.base, self.chroot_string) prefix = os.path.join(self.base, self.chroot_string)
if '--buildresult' not in remaining_arguments: if '--buildresult' not in remaining_arguments:
result = '%s_result/' % prefix result = '%s_result/' % prefix
else: else:
location_of_arg = remaining_arguments.index('--buildresult') location_of_arg = remaining_arguments.index('--buildresult')
result = remaining_arguments[location_of_arg+1] result = remaining_arguments[location_of_arg+1]
remaining_arguments.pop(location_of_arg+1) remaining_arguments.pop(location_of_arg+1)
remaining_arguments.pop(location_of_arg) remaining_arguments.pop(location_of_arg)
if not self.logfile and self.operation != 'login': if not self.logfile and self.operation != 'login':
self.logfile = os.path.normpath('%s/last_operation.log' % result) self.logfile = os.path.normpath('%s/last_operation.log' % result)

18
ubuntutools/builder.py
View File

@ -50,15 +50,17 @@ class Pbuilder(Builder):
Logger.command(cmd) Logger.command(cmd)
return subprocess.call(cmd) return subprocess.call(cmd)
class Pbuilderdist(Builder): class Pbuilderdist(Builder):
def __init__(self): def __init__(self):
Builder.__init__(self, "pbuilder-dist") Builder.__init__(self, "pbuilder-dist")
def build(self, dsc_file, dist, result_directory): def build(self, dsc_file, dist, result_directory):
cmd = ["pbuilder-dist", dist, self.architecture, cmd = ["pbuilder-dist", dist, self.architecture,
"build", dsc_file, "--buildresult", result_directory] "build", dsc_file, "--buildresult", result_directory]
Logger.command(cmd) Logger.command(cmd)
return subprocess.call(cmd) return subprocess.call(cmd)
class Sbuild(Builder): class Sbuild(Builder):
def __init__(self): def __init__(self):
@ -84,9 +86,9 @@ def getBuilder(builder=None):
if builder == 'pbuilder': if builder == 'pbuilder':
return Pbuilder() return Pbuilder()
elif builder == 'pbuilder-dist': elif builder == 'pbuilder-dist':
return Pbuilderdist() return Pbuilderdist()
elif builder == 'sbuild': elif builder == 'sbuild':
return Sbuild() return Sbuild()
Logger.error("Unsupported builder specified: %s. Only pbuilder, pbuilder-dist and " Logger.error("Unsupported builder specified: %s. Only pbuilder, "
"sbuild are supported." % builder) "pbuilder-dist and sbuild are supported." % builder)