diff --git a/backportpackage b/backportpackage index 903ad1d..b0374a7 100755 --- a/backportpackage +++ b/backportpackage @@ -196,7 +196,7 @@ def do_build(workdir, package, release, bp_version, builder, update): return builder.build(os.path.join(workdir, '%s_%s.dsc' % (package, bp_version)), release, - workdir) + os.path.join(workdir, "buildresult")) def do_upload(workdir, package, bp_version, upload): print 'Please check %s %s in file://%s carefully!' % \ diff --git a/ubuntutools/builder.py b/ubuntutools/builder.py index ee88876..ca04473 100644 --- a/ubuntutools/builder.py +++ b/ubuntutools/builder.py @@ -31,6 +31,10 @@ class Builder(object): process = subprocess.Popen(cmd, stdout=subprocess.PIPE) 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): return self.architecture @@ -43,6 +47,7 @@ class Pbuilder(Builder): Builder.__init__(self, "pbuilder") def build(self, dsc_file, dist, result_directory): + self.build_preparation(result_directory) # TODO: Do not rely on a specific pbuilder configuration. cmd = ["sudo", "-E", "DIST=" + dist, "pbuilder", "--build", "--distribution", dist, "--architecture", self.architecture, @@ -62,6 +67,7 @@ class Pbuilderdist(Builder): Builder.__init__(self, "pbuilder-dist") def build(self, dsc_file, dist, result_directory): + self.build_preparation(result_directory) cmd = ["pbuilder-dist", dist, self.architecture, "build", dsc_file, "--buildresult", result_directory] Logger.command(cmd) @@ -78,6 +84,7 @@ class Sbuild(Builder): Builder.__init__(self, "sbuild") def build(self, dsc_file, dist, result_directory): + self.build_preparation(result_directory) workdir = os.getcwd() Logger.command(["cd", result_directory]) os.chdir(result_directory) diff --git a/ubuntutools/sponsor_patch/main.py b/ubuntutools/sponsor_patch/main.py index c3334b2..6e6cc11 100644 --- a/ubuntutools/sponsor_patch/main.py +++ b/ubuntutools/sponsor_patch/main.py @@ -396,9 +396,7 @@ def main(bug_number, update, build, edit, keyid, upload, workdir, builder, if build: dist = re.sub("-.*$", "", changelog.distributions) - buildresult = os.path.join(workdir, task.package + "-buildresult") - if not os.path.isdir(buildresult): - os.makedirs(buildresult) + buildresult = os.path.join(workdir, "buildresult") successful_built = False while not successful_built: