Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/bockbuild.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Christoforides <alexis@thenull.net>2017-05-30 20:27:37 +0300
committerAlexis Christoforides <alexis@thenull.net>2017-05-30 20:27:37 +0300
commit1f303af76929ed6cd942f51f4177afc93c797f00 (patch)
tree7f4432934a9e88d48fb1b11453b22bdf8a037bf1 /bockbuild.py
parentd3447874b83363d7e2b8837b49f5b38777a4a1cc (diff)
Properly address regression from 77ded2ba3bf7509243e98753e8f607a42bcbcbf5. Also fix accidental overwrite of 'dest'
Diffstat (limited to 'bockbuild.py')
-rwxr-xr-xbockbuild.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bockbuild.py b/bockbuild.py
index 5b41853..122fee8 100755
--- a/bockbuild.py
+++ b/bockbuild.py
@@ -198,8 +198,8 @@ class Bockbuild:
delete(package.log)
package.source_dir_name = expand_macros(package.source_dir_name, package)
- dest = os.path.join(self.build_root, package.source_dir_name)
- package.fetch(dest)
+ workspace_path = os.path.join(self.build_root, package.source_dir_name)
+ package.fetch(workspace_path)
if self.full_rebuild:
package.request_build('Full rebuild')
@@ -223,7 +223,7 @@ class Bockbuild:
package.deploy_requests.append (stage)
for package in packages.values():
- package.start_build(arch, stage, stage)
+ package.start_build(arch, dest, stage)
# make artifact in scratch
# delete artifact + buildstring
with open(package.buildstring_file, 'w') as output: