Merge lp:~robru/cupstream2distro/fix-filenotfounderror into lp:cupstream2distro

Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 1311
Merged at revision: 1312
Proposed branch: lp:~robru/cupstream2distro/fix-filenotfounderror
Merge into: lp:cupstream2distro
Diff against target: 35 lines (+8/-1)
2 files modified
.bzr-builddeb/default.conf (+2/-0)
citrain/recipes/base.py (+6/-1)
To merge this branch: bzr merge lp:~robru/cupstream2distro/fix-filenotfounderror
Reviewer Review Type Date Requested Status
CU2D maintainers Pending
Review via email: mp+279976@code.launchpad.net

Commit message

Fix FileNotFoundError

To post a comment you must log in.
1312. By Robert Bruce Park

Build in split mode as required by train.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2015-12-09 07:29:16 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'citrain/recipes/base.py'
10--- citrain/recipes/base.py 2015-12-08 06:04:44 +0000
11+++ citrain/recipes/base.py 2015-12-09 07:29:16 +0000
12@@ -143,6 +143,7 @@
13 self.primary = primary
14 self.series = series
15 self.target = None
16+ self.make_parent()
17 self.dest = dest
18
19 def check_status(self):
20@@ -275,10 +276,14 @@
21 logging.info('Landing request verified.')
22 logging.info(silo_state.summarize(status=False))
23
24+ def make_parent(self):
25+ """Create the parent directory for us to work in."""
26+ makedirs(self.parent, exist_ok=True)
27+
28 def clean_phase(self):
29 """Delete files leftover from previous builds."""
30 destroy(self.parent)
31- makedirs(self.parent, exist_ok=True)
32+ self.make_parent()
33
34 def collect_phase(self):
35 """Fetch the package to build. Subclasses must implement this."""

Subscribers

People subscribed via source and target branches