1
=== modified file 'lib/canonical/buildd/buildrecipe'
2
--- lib/canonical/buildd/buildrecipe	2010-09-09 14:12:02 +0000
3
+++ lib/canonical/buildd/buildrecipe	2010-10-19 18:01:48 +0000
4
@@ -7,10 +7,12 @@
5
7
__metaclass__ = type
7
__metaclass__ = type
6
8
8
7
9
9
8
10
import errno
9
10
import os
11
import os
10
11
import pwd
12
import pwd
11
13
import re
12
12
import socket
14
import socket
14
13
from subprocess import call
15
from subprocess import call, Popen, PIPE
15
14
import sys
16
import sys
16
15
17
17
16
18
18
@@ -21,6 +23,26 @@
19
21
RETCODE_FAILURE_BUILD_SOURCE_PACKAGE = 203
23
RETCODE_FAILURE_BUILD_SOURCE_PACKAGE = 203
20
22
24
21
23
25
22
26
class NotVirtualized(Exception):
23
27
    """Exception raised when not running in a virtualized environment."""
24
28
25
29
26
30
class NoXenDetect(NotVirtualized):
27
31
    """xen-detect not installed."""
28
32
29
33
    def __init__(self):
30
34
        NotVirtualized.__init__(self, 'xen-detect is not installed.')
31
35
32
36
33
37
class BadXenDetect(NotVirtualized):
34
38
    """xen-detect's output not not indicate that we are virtualized."""
35
39
36
40
    def __init__(self, xen_detect_output):
37
41
        NotVirtualized.__init__(
38
42
            self, 'Bad xen-detect output: %s' % xen_detect_output)
39
43
        self.xen_detect_output = xen_detect_output
40
44
41
45
42
24
class RecipeBuilder:
46
class RecipeBuilder:
43
25
    """Builds a package from a recipe."""
47
    """Builds a package from a recipe."""
44
26
48
45
@@ -64,6 +86,12 @@
46
64
        As a side-effect, sets self.source_dir_relative.
86
        As a side-effect, sets self.source_dir_relative.
47
65
        :return: a retcode from `bzr dailydeb`.
87
        :return: a retcode from `bzr dailydeb`.
48
66
        """
88
        """
49
89
        try:
50
90
            ensure_virtualized()
51
91
        except NotVirtualized, e:
52
92
            sys.stderr.write('Aborting on failed virtualization check:\n')
53
93
            sys.stderr.write(str(e))
54
94
            return 1
55
67
        assert not os.path.exists(self.tree_path)
95
        assert not os.path.exists(self.tree_path)
56
68
        recipe_path = os.path.join(self.work_dir, 'recipe')
96
        recipe_path = os.path.join(self.work_dir, 'recipe')
57
69
        manifest_path = os.path.join(self.tree_path, 'manifest')
97
        manifest_path = os.path.join(self.tree_path, 'manifest')
58
@@ -159,6 +187,24 @@
59
159
    return os.path.join(
187
    return os.path.join(
60
160
        os.environ["HOME"], "build-" + build_id, *extra)
188
        os.environ["HOME"], "build-" + build_id, *extra)
61
161
189
62
190
63
191
def ensure_virtualized():
64
192
    """Raise an exception if not running in a virtualized environment.
65
193
66
194
    Raises if unsure, or if not running under Xen.
67
195
    """
68
196
    try:
69
197
        proc = Popen(['xen-detect'], stdout=PIPE)
70
198
    except OSError, e:
71
199
        if e.errno != errno.ENOENT:
72
200
            raise
73
201
        raise NoXenDetect()
74
202
    status_code = proc.wait()
75
203
    output = proc.stdout.read()
76
204
    if not re.match('Running in .* context on Xen', output):
77
205
        raise BadXenDetect(output)
78
206
79
207
80
162
if __name__ == '__main__':
208
if __name__ == '__main__':
81
163
    builder = RecipeBuilder(*sys.argv[1:])
209
    builder = RecipeBuilder(*sys.argv[1:])
82
164
    if builder.buildTree() != 0:
210
    if builder.buildTree() != 0:
Reviewer	Review Type	Date Requested	Status
Paul Hummer (community)		2010-10-19	Disapprove on 2010-10-19
Review via email: mp+38867@code.launchpad.net