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

backportpackage: Put build result into /buildresult to avoid signature problems with the source tarball.

Browse Source
This commit is contained in:
Benjamin Drung 2010-12-18 20:35:20 +01:00
parent 5371195caa
commit d7ee62e951
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backportpackage
View File

@ -196,7 +196,7 @@ def do_build(workdir, package, release, bp_version, builder, update):
return builder.build(os.path.join(workdir, return builder.build(os.path.join(workdir,
'%s_%s.dsc' % (package, bp_version)), '%s_%s.dsc' % (package, bp_version)),
release, release,
workdir) os.path.join(workdir, "buildresult"))
def do_upload(workdir, package, bp_version, upload): def do_upload(workdir, package, bp_version, upload):
print 'Please check %s %s in file://%s carefully!' % \ print 'Please check %s %s in file://%s carefully!' % \

7
ubuntutools/builder.py
View File

@ -31,6 +31,10 @@ class Builder(object):
process = subprocess.Popen(cmd, stdout=subprocess.PIPE) process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
self.architecture = process.communicate()[0].strip() self.architecture = process.communicate()[0].strip()
def build_preparation(self, result_directory):
if not os.path.isdir(result_directory):
os.makedirs(result_directory)
def get_architecture(self): def get_architecture(self):
return self.architecture return self.architecture
@ -43,6 +47,7 @@ class Pbuilder(Builder):
Builder.__init__(self, "pbuilder") Builder.__init__(self, "pbuilder")
def build(self, dsc_file, dist, result_directory): def build(self, dsc_file, dist, result_directory):
self.build_preparation(result_directory)
# TODO: Do not rely on a specific pbuilder configuration. # TODO: Do not rely on a specific pbuilder configuration.
cmd = ["sudo", "-E", "DIST=" + dist, "pbuilder", "--build", cmd = ["sudo", "-E", "DIST=" + dist, "pbuilder", "--build",
"--distribution", dist, "--architecture", self.architecture, "--distribution", dist, "--architecture", self.architecture,
@ -62,6 +67,7 @@ class Pbuilderdist(Builder):
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):
self.build_preparation(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)
@ -78,6 +84,7 @@ class Sbuild(Builder):
Builder.__init__(self, "sbuild") Builder.__init__(self, "sbuild")
def build(self, dsc_file, dist, result_directory): def build(self, dsc_file, dist, result_directory):
self.build_preparation(result_directory)
workdir = os.getcwd() workdir = os.getcwd()
Logger.command(["cd", result_directory]) Logger.command(["cd", result_directory])
os.chdir(result_directory) os.chdir(result_directory)

4
ubuntutools/sponsor_patch/main.py
View File

@ -396,9 +396,7 @@ def main(bug_number, update, build, edit, keyid, upload, workdir, builder,
if build: if build:
dist = re.sub("-.*$", "", changelog.distributions) dist = re.sub("-.*$", "", changelog.distributions)
buildresult = os.path.join(workdir, task.package + "-buildresult") buildresult = os.path.join(workdir, "buildresult")
if not os.path.isdir(buildresult):
os.makedirs(buildresult)
successful_built = False successful_built = False
while not successful_built: while not successful_built: