1
=== modified file 'lib/canonical/launchpad/daemons/tachandler.py'
2
--- lib/canonical/launchpad/daemons/tachandler.py	2010-02-19 13:27:29 +0000
3
+++ lib/canonical/launchpad/daemons/tachandler.py	2010-03-18 19:22:29 +0000
4
@@ -7,11 +7,16 @@
5
7
7
6
8
__metaclass__ = type
8
__metaclass__ = type
7
9
9
13
10
__all__ = ['TacTestSetup', 'ReadyService', 'TacException']
10
__all__ = [
14
11
11
    'TacTestSetup',
15
12
12
    'ReadyService',
16
13
# This file is used by launchpad-buildd, so it cannot import any
13
    'TacException',
17
14
# Launchpad code!
14
    'kill_by_pidfile',
18
15
    'remove_if_exists',
19
16
    'two_stage_kill',
20
17
    ]
21
18
22
19
23
15
import errno
20
import errno
24
16
import sys
21
import sys
25
17
import os
22
import os
26
@@ -22,6 +27,77 @@
27
22
from twisted.application import service
27
from twisted.application import service
28
23
from twisted.python import log
28
from twisted.python import log
29
24
29
30
30
# This file is used by launchpad-buildd, so it cannot import any
31
31
# Launchpad code!
32
32
33
33
34
34
def two_stage_kill(pid, poll_interval=0.1, num_polls=50):
35
35
    """Kill process 'pid' with SIGTERM. If it doesn't die, SIGKILL it.
36
36
37
37
    :param pid: The pid of the process to kill.
38
38
    :param poll_interval: The polling interval used to check if the
39
39
        process is still around.
40
40
    :param num_polls: The number of polls to do before doing a SIGKILL.
41
41
    """
42
42
    # Kill the process.
43
43
    try:
44
44
        os.kill(pid, SIGTERM)
45
45
    except OSError, e:
46
46
        if e.errno in (errno.ESRCH, errno.ECHILD):
47
47
            # Process has already been killed.
48
48
            return
49
49
50
50
    # Poll until the process has ended.
51
51
    for i in range(num_polls):
52
52
        try:
53
53
            # Reap the child process and get its return value. If it's not
54
54
            # gone yet, continue.
55
55
            new_pid, result = os.waitpid(pid, os.WNOHANG)
56
56
            if new_pid:
57
57
                return result
58
58
            time.sleep(poll_interval)
59
59
        except OSError, e:
60
60
            # Raised if the process is gone by the time we try to get the
61
61
            # return value.
62
62
            return
63
63
64
64
    # The process is still around, so terminate it violently.
65
65
    try:
66
66
        os.kill(pid, SIGKILL)
67
67
    except OSError:
68
68
        # Already terminated
69
69
        pass
70
70
71
71
72
72
def kill_by_pidfile(pidfile_path):
73
73
    """Kill a process identified by the pid stored in a file.
74
74
75
75
    The pid file is removed from disk.
76
76
    """
77
77
    if not os.path.exists(pidfile_path):
78
78
        return
79
79
    try:
80
80
        # Get the pid.
81
81
        pid = open(pidfile_path, 'r').read().split()[0]
82
82
        try:
83
83
            pid = int(pid)
84
84
        except ValueError:
85
85
            # pidfile contains rubbish
86
86
            return
87
87
88
88
        two_stage_kill(pid)
89
89
    finally:
90
90
        remove_if_exists(pidfile_path)
91
91
92
92
93
93
def remove_if_exists(path):
94
94
    """Remove the given file if it exists."""
95
95
    try:
96
96
        os.remove(path)
97
97
    except OSError, e:
98
98
        if e.errno != errno.ENOENT:
99
99
            raise
100
100
101
25
101
102
26
twistd_script = os.path.abspath(os.path.join(
102
twistd_script = os.path.abspath(os.path.join(
103
27
    os.path.dirname(__file__),
103
    os.path.dirname(__file__),
104
@@ -48,7 +124,7 @@
105
48
        # started. If it sees an old logfile, then it will find the LOG_MAGIC
124
        # started. If it sees an old logfile, then it will find the LOG_MAGIC
106
49
        # string and return immediately, provoking hard-to-diagnose race
125
        # string and return immediately, provoking hard-to-diagnose race
107
50
        # conditions. Delete the logfile to make sure this does not happen.
126
        # conditions. Delete the logfile to make sure this does not happen.
109
51
        self._removeFile(self.logfile)
127
        remove_if_exists(self.logfile)
110
52
128
111
53
        self.setUpRoot()
129
        self.setUpRoot()
112
54
        args = [sys.executable, twistd_script, '-o', '-y', self.tacfile,
130
        args = [sys.executable, twistd_script, '-o', '-y', self.tacfile,
113
@@ -107,50 +183,10 @@
114
107
    def tearDown(self):
183
    def tearDown(self):
115
108
        self.killTac()
184
        self.killTac()
116
109
185
117
110
    def _removeFile(self, filename):
118
111
        """Remove the given file if it exists."""
119
112
        try:
120
113
            os.remove(filename)
121
114
        except OSError, e:
122
115
            if e.errno != errno.ENOENT:
123
116
                raise
124
117
125
118
    def killTac(self):
186
    def killTac(self):
126
119
        """Kill the TAC file if it is running."""
187
        """Kill the TAC file if it is running."""
127
120
        pidfile = self.pidfile
188
        pidfile = self.pidfile
161
121
        if not os.path.exists(pidfile):
189
        kill_by_pidfile(pidfile)
129
122
            return
130
123
131
124
        # Get the pid.
132
125
        pid = open(pidfile, 'r').read().strip()
133
126
        try:
134
127
            pid = int(pid)
135
128
        except ValueError:
136
129
            # pidfile contains rubbish
137
130
            return
138
131
139
132
        # Kill the process.
140
133
        try:
141
134
            os.kill(pid, SIGTERM)
142
135
        except OSError, e:
143
136
            if e.errno in (errno.ESRCH, errno.ECHILD):
144
137
                # Process has already been killed.
145
138
                return
146
139
147
140
        # Poll until the process has ended.
148
141
        for i in range(50):
149
142
            try:
150
143
                os.kill(pid, 0)
151
144
                time.sleep(0.1)
152
145
            except OSError, e:
153
146
                break
154
147
        else:
155
148
            # The process is still around, so terminate it violently.
156
149
            try:
157
150
                os.kill(pid, SIGKILL)
158
151
            except OSError:
159
152
                # Already terminated
160
153
                pass
162
154
190
163
155
    def setUpRoot(self):
191
    def setUpRoot(self):
164
156
        """Override this.
192
        """Override this.
165
157
193
166
=== modified file 'lib/lp/poppy/filesystem.py'
167
--- lib/lp/poppy/filesystem.py	2009-06-25 05:30:52 +0000
168
+++ lib/lp/poppy/filesystem.py	2010-03-18 19:22:29 +0000
169
@@ -6,7 +6,6 @@
170
6
import datetime
6
import datetime
171
7
import os
7
import os
172
8
import stat
8
import stat
173
9
import shutil
174
10
from zope.security.interfaces import Unauthorized
9
from zope.security.interfaces import Unauthorized
175
11
from zope.server.interfaces.ftp import IFileSystem
10
from zope.server.interfaces.ftp import IFileSystem
176
12
from zope.interface import implements
11
from zope.interface import implements
177
13
12
178
=== added file 'lib/lp/poppy/tests/__init__.py'
179
--- lib/lp/poppy/tests/__init__.py	1970-01-01 00:00:00 +0000
180
+++ lib/lp/poppy/tests/__init__.py	2010-03-18 19:22:29 +0000
181
@@ -0,0 +1,5 @@
182
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
183
2
# GNU Affero General Public License version 3 (see the file LICENSE).
184
3
185
4
"""Tests for Poppy."""
186
5
187
0
6
188
=== renamed file 'lib/lp/poppy/tests/__init__.py' => 'lib/lp/poppy/tests/helpers.py'
189
--- lib/lp/poppy/tests/__init__.py	2009-06-25 05:39:50 +0000
190
+++ lib/lp/poppy/tests/helpers.py	2010-03-18 19:22:29 +0000
191
@@ -5,16 +5,18 @@
192
5
5
193
6
import os
6
import os
194
7
import select
7
import select
195
8
import signal
196
9
import subprocess
8
import subprocess
197
10
import sys
9
import sys
198
11
import time
10
import time
199
12
11
200
13
from canonical.config import config
12
from canonical.config import config
201
13
from lp.services.osutils import two_stage_kill
202
14
203
14
15
204
15
class SoyuzUploadError(Exception):
16
class SoyuzUploadError(Exception):
205
16
    """Used in the soyuz-upload test."""
17
    """Used in the soyuz-upload test."""
206
17
18
207
19
208
18
class PoppyTestSetup:
20
class PoppyTestSetup:
209
19
    """Provides a setup and teardown mechanism for a poppy subprocess instance.
21
    """Provides a setup and teardown mechanism for a poppy subprocess instance.
210
20
22
211
@@ -34,28 +36,18 @@
212
34
    def startPoppy(self):
36
    def startPoppy(self):
213
35
        """Start the poppy instance."""
37
        """Start the poppy instance."""
214
36
        script = os.path.join(config.root, "daemons/poppy-upload.py")
38
        script = os.path.join(config.root, "daemons/poppy-upload.py")
220
37
        self.process = subprocess.Popen([sys.executable, script,
39
        self.process = subprocess.Popen(
221
38
                                         "--allow-user", self.user,
40
            [sys.executable, script, "--allow-user", self.user,
222
39
                                         "--cmd", self.cmd,
41
             "--cmd", self.cmd, self.fsroot, self.port],
223
40
                                         self.fsroot, self.port],
42
            stdout=subprocess.PIPE)
219
41
                                        stdout=subprocess.PIPE)
224
42
        self.running = True
43
        self.running = True
225
43
44
226
44
    def killPoppy(self):
45
    def killPoppy(self):
227
45
        """Kill the poppy instance dead."""
46
        """Kill the poppy instance dead."""
228
46
        if not self.alive:
47
        if not self.alive:
229
47
            return
48
            return
239
48
        os.kill(self.process.pid, signal.SIGTERM)
49
        two_stage_kill(self.process.pid)
231
49
        # Give poppy a chance to die
232
50
        time.sleep(2)
233
51
        # Look to see if it has died yet
234
52
        ret = self.process.poll()
235
53
        if ret is None:
236
54
            # Poppy had not died, so send it SIGKILL
237
55
            os.kill(self.process.pid, signal.SIGKILL)
238
56
        # Finally return the result.
240
57
        self.running = False
50
        self.running = False
241
58
        return self.process.wait()
242
59
51
243
60
    @property
52
    @property
244
61
    def alive(self):
53
    def alive(self):
245
62
54
246
=== modified file 'lib/lp/poppy/tests/test_poppy.py'
247
--- lib/lp/poppy/tests/test_poppy.py	2010-03-17 11:04:20 +0000
248
+++ lib/lp/poppy/tests/test_poppy.py	2010-03-18 19:22:29 +0000
249
@@ -7,45 +7,38 @@
250
7
7
251
8
import ftplib
8
import ftplib
252
9
import os
9
import os
253
10
import shutil
254
11
import socket
10
import socket
255
12
import tempfile
256
13
import unittest
11
import unittest
257
14
import StringIO
12
import StringIO
258
15
13
264
16
from canonical.testing import LaunchpadZopelessLayer
14
from lp.poppy.tests.helpers import PoppyTestSetup
265
17
from lp.poppy.tests import PoppyTestSetup
15
from lp.testing import TestCase
266
18
16
267
19
17
268
20
class TestPoppy(unittest.TestCase):
18
class TestPoppy(TestCase):
269
21
    """Test if poppy.py daemon works properly."""
19
    """Test if poppy.py daemon works properly."""
270
22
20
271
23
    layer = LaunchpadZopelessLayer
272
24
273
25
    def setUp(self):
21
    def setUp(self):
274
26
        """Set up poppy in a temp dir."""
22
        """Set up poppy in a temp dir."""
276
27
        self.root_dir = tempfile.mkdtemp()
23
        super(TestPoppy, self).setUp()
277
24
        self.root_dir = self.makeTemporaryDirectory()
278
28
        self.port = 3421
25
        self.port = 3421
279
29
        self.poppy = PoppyTestSetup(self.root_dir, port=self.port,
26
        self.poppy = PoppyTestSetup(self.root_dir, port=self.port,
280
30
                                    cmd='echo CLOSED')
27
                                    cmd='echo CLOSED')
281
31
        self.poppy.startPoppy()
28
        self.poppy.startPoppy()
287
32
29
        self.addCleanup(self.poppy.killPoppy)
283
33
    def tearDown(self):
284
34
        """Purge poppy root directory."""
285
35
        self.poppy.killPoppy()
286
36
        shutil.rmtree(self.root_dir)
288
37
30
289
38
    def getFTPConnection(self, login=True, user="ubuntu", password=""):
31
    def getFTPConnection(self, login=True, user="ubuntu", password=""):
290
39
        """Build and return a FTP connection to the current poppy.
32
        """Build and return a FTP connection to the current poppy.
291
40
33
293
41
        Optionally log in with as 'annonymous' & empty password, or passed
34
        Optionally log in with as 'anonymous' & empty password, or passed
294
42
        user/password.
35
        user/password.
295
43
        """
36
        """
296
44
        conn = ftplib.FTP()
37
        conn = ftplib.FTP()
297
45
        # poppy usually takes sometime to come up, we need to wait, or insist.
38
        # poppy usually takes sometime to come up, we need to wait, or insist.
298
46
        while True:
39
        while True:
299
47
            try:
40
            try:
301
48
                reply = conn.connect("localhost", self.port)
41
                conn.connect("localhost", self.port)
302
49
            except socket.error:
42
            except socket.error:
303
50
                if not self.poppy.alive:
43
                if not self.poppy.alive:
304
51
                    raise
44
                    raise
305
@@ -75,7 +68,7 @@
306
75
        upload_dir = contents[1]
68
        upload_dir = contents[1]
307
76
        return os.path.join(self.root_dir, upload_dir, path)
69
        return os.path.join(self.root_dir, upload_dir, path)
308
77
70
310
78
    def testLOGIN(self):
71
    def test_LOGIN(self):
311
79
        """Check login procedure and the state of the toplevel lockfile.
72
        """Check login procedure and the state of the toplevel lockfile.
312
80
73
313
81
        The toplevel lockfile should allow the process-upload runner (lp_queue,
74
        The toplevel lockfile should allow the process-upload runner (lp_queue,
314
@@ -90,7 +83,7 @@
315
90
        lockfile_path = os.path.join(self.root_dir, '.lock')
83
        lockfile_path = os.path.join(self.root_dir, '.lock')
316
91
        self.assertEqual(os.stat(lockfile_path).st_mode, 0100664)
84
        self.assertEqual(os.stat(lockfile_path).st_mode, 0100664)
317
92
85
319
93
    def testCWD(self):
86
    def test_CWD(self):
320
94
        """Check automatic creation of directories 'cwd'ed in.
87
        """Check automatic creation of directories 'cwd'ed in.
321
95
88
322
96
        Also ensure they are created with proper permission (g+rwxs)
89
        Also ensure they are created with proper permission (g+rwxs)
323
@@ -107,7 +100,7 @@
324
107
        self.assertTrue(os.path.exists(wanted_path))
100
        self.assertTrue(os.path.exists(wanted_path))
325
108
        self.assertEqual(os.stat(wanted_path).st_mode, 042775)
101
        self.assertEqual(os.stat(wanted_path).st_mode, 042775)
326
109
102
328
110
    def testMKD(self):
103
    def test_MKD(self):
329
111
        """Check recursive MKD (aka mkdir -p).
104
        """Check recursive MKD (aka mkdir -p).
330
112
105
331
113
        Also ensure they are created with proper permission (g+rwxs)
106
        Also ensure they are created with proper permission (g+rwxs)
332
@@ -128,7 +121,7 @@
333
128
        self.assertTrue(os.path.exists(wanted_path))
121
        self.assertTrue(os.path.exists(wanted_path))
334
129
        self.assertEqual(os.stat(wanted_path).st_mode, 042775)
122
        self.assertEqual(os.stat(wanted_path).st_mode, 042775)
335
130
123
337
131
    def testRMD(self):
124
    def test_RMD(self):
338
132
        """Check recursive RMD (aka rmdir)"""
125
        """Check recursive RMD (aka rmdir)"""
339
133
        conn = self.getFTPConnection()
126
        conn = self.getFTPConnection()
340
134
        self.assertEqual(
127
        self.assertEqual(
341
@@ -143,7 +136,7 @@
342
143
        wanted_path = self._uploadPath('foo')
136
        wanted_path = self._uploadPath('foo')
343
144
        self.assertFalse(os.path.exists(wanted_path))
137
        self.assertFalse(os.path.exists(wanted_path))
344
145
138
346
146
    def testSTOR(self):
139
    def test_STOR(self):
347
147
        """Check if the parent directories are created during file upload.
140
        """Check if the parent directories are created during file upload.
348
148
141
349
149
        The uploaded file permissions are also special (g+rwxs).
142
        The uploaded file permissions are also special (g+rwxs).
350
@@ -160,7 +153,7 @@
351
160
        self.assertEqual(fs_content, "fake contents")
153
        self.assertEqual(fs_content, "fake contents")
352
161
        self.assertEqual(os.stat(wanted_path).st_mode, 0102674)
154
        self.assertEqual(os.stat(wanted_path).st_mode, 0102674)
353
162
155
355
163
    def testUploadIsolation(self):
156
    def test_uploadIsolation(self):
356
164
        """Check if poppy isolates the uploads properly.
157
        """Check if poppy isolates the uploads properly.
357
165
158
358
166
        Upload should be done atomically, i.e., poppy should isolate the
159
        Upload should be done atomically, i.e., poppy should isolate the
359
@@ -216,5 +209,6 @@
360
216
                self.root_dir, upload_dirs[index], "test")).read()
209
                self.root_dir, upload_dirs[index], "test")).read()
361
217
            self.assertEqual(content, expected_contents[index])
210
            self.assertEqual(content, expected_contents[index])
362
218
211
363
212
364
219
def test_suite():
213
def test_suite():
365
220
    return unittest.TestLoader().loadTestsFromName(__name__)
214
    return unittest.TestLoader().loadTestsFromName(__name__)
366
221
215
367
=== modified file 'lib/lp/services/osutils.py'
368
--- lib/lp/services/osutils.py	2009-12-21 02:50:08 +0000
369
+++ lib/lp/services/osutils.py	2010-03-18 19:22:29 +0000
370
@@ -8,67 +8,21 @@
371
8
    'remove_tree',
8
    'remove_tree',
372
9
    'kill_by_pidfile',
9
    'kill_by_pidfile',
373
10
    'remove_if_exists',
10
    'remove_if_exists',
374
11
    'two_stage_kill',
375
11
    ]
12
    ]
376
12
13
377
13
import errno
378
14
import os.path
14
import os.path
379
15
from signal import SIGTERM, SIGKILL
380
16
import shutil
15
import shutil
382
17
import time
16
383
17
384
18
from canonical.launchpad.daemons.tachandler import (
385
19
    kill_by_pidfile,
386
20
    remove_if_exists,
387
21
    two_stage_kill,
388
22
    )
389
18
23
390
19
24
391
20
def remove_tree(path):
25
def remove_tree(path):
392
21
    """Remove the tree at 'path' from disk."""
26
    """Remove the tree at 'path' from disk."""
393
22
    if os.path.exists(path):
27
    if os.path.exists(path):
394
23
        shutil.rmtree(path)
28
        shutil.rmtree(path)
395
24
396
25
397
26
def kill_by_pidfile(pidfile_path):
398
27
    """Kill a process identified by the pid stored in a file.
399
28
400
29
    The pid file is removed from disk.
401
30
    """
402
31
    if not os.path.exists(pidfile_path):
403
32
        return
404
33
    try:
405
34
        # Get the pid.
406
35
        pid = open(pidfile_path, 'r').read().split()[0]
407
36
        try:
408
37
            pid = int(pid)
409
38
        except ValueError:
410
39
            # pidfile contains rubbish
411
40
            return
412
41
413
42
        # Kill the process.
414
43
        try:
415
44
            os.kill(pid, SIGTERM)
416
45
        except OSError, e:
417
46
            if e.errno in (errno.ESRCH, errno.ECHILD):
418
47
                # Process has already been killed.
419
48
                return
420
49
421
50
        # Poll until the process has ended.
422
51
        for i in range(50):
423
52
            try:
424
53
                os.kill(pid, 0)
425
54
                time.sleep(0.1)
426
55
            except OSError, e:
427
56
                break
428
57
        else:
429
58
            # The process is still around, so terminate it violently.
430
59
            try:
431
60
                os.kill(pid, SIGKILL)
432
61
            except OSError:
433
62
                # Already terminated
434
63
                pass
435
64
    finally:
436
65
        remove_if_exists(pidfile_path)
437
66
438
67
439
68
def remove_if_exists(path):
440
69
    """Remove the given file if it exists."""
441
70
    try:
442
71
        os.remove(path)
443
72
    except OSError, e:
444
73
        if e.errno != errno.ENOENT:
445
74
            raise
446
75
29
447
=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt.disabled'
448
--- lib/lp/soyuz/doc/soyuz-upload.txt.disabled	2010-03-17 11:04:20 +0000
449
+++ lib/lp/soyuz/doc/soyuz-upload.txt.disabled	2010-03-18 19:22:29 +0000
450
@@ -186,7 +186,7 @@
451
186
Right, that's all we need from the FTP server. We don't need it anymore,
186
Right, that's all we need from the FTP server. We don't need it anymore,
452
187
so we'll just kill the process.
187
so we'll just kill the process.
453
188
188
455
189
  >>> status = poppy.killPoppy()
189
  >>> poppy.killPoppy()
456
190
190
457
191
Finally, we'll just create an entirely empty upload folder. We rely for
191
Finally, we'll just create an entirely empty upload folder. We rely for
458
192
our tests on a poppy-like naming system, ie. that the upload folder
192
our tests on a poppy-like naming system, ie. that the upload folder
459
193
193
460
=== modified file 'lib/lp/testing/__init__.py'
461
--- lib/lp/testing/__init__.py	2010-03-16 18:03:34 +0000
462
+++ lib/lp/testing/__init__.py	2010-03-18 19:22:29 +0000
463
@@ -215,7 +215,7 @@
464
215
    def makeTemporaryDirectory(self):
215
    def makeTemporaryDirectory(self):
465
216
        """Create a temporary directory, and return its path."""
216
        """Create a temporary directory, and return its path."""
466
217
        tempdir = tempfile.mkdtemp()
217
        tempdir = tempfile.mkdtemp()
468
218
        self.addCleanup(lambda: shutil.rmtree(tempdir))
218
        self.addCleanup(shutil.rmtree, tempdir)
469
219
        return tempdir
219
        return tempdir
470
220
220
471
221
    def assertProvides(self, obj, interface):
221
    def assertProvides(self, obj, interface):
472
@@ -380,11 +380,10 @@
473
380
380
474
381
    def useTempDir(self):
381
    def useTempDir(self):
475
382
        """Use a temporary directory for this test."""
382
        """Use a temporary directory for this test."""
478
383
        tempdir = tempfile.mkdtemp()
383
        tempdir = self.makeTemporaryDirectory()
477
384
        self.addCleanup(lambda: shutil.rmtree(tempdir))
479
385
        cwd = os.getcwd()
384
        cwd = os.getcwd()
480
386
        os.chdir(tempdir)
385
        os.chdir(tempdir)
482
387
        self.addCleanup(lambda: os.chdir(cwd))
386
        self.addCleanup(os.chdir, cwd)
483
388
387
484
389
388
485
390
class TestCaseWithFactory(TestCase):
389
class TestCaseWithFactory(TestCase):
Status:	Merged
Approved by:	Jonathan Lange on 2010-03-18
Approved revision:	no longer in the source branch.
Merged at revision:	not available
Proposed branch:	lp:~jml/launchpad/sftp-poppy
Merge into:	lp:launchpad
Diff against target:	485 lines (+125/-146) 8 files modified lib/canonical/launchpad/daemons/tachandler.py (+83/-47) lib/lp/poppy/filesystem.py (+0/-1) lib/lp/poppy/tests/__init__.py (+5/-0) lib/lp/poppy/tests/helpers.py (+8/-16) lib/lp/poppy/tests/test_poppy.py (+17/-23) lib/lp/services/osutils.py (+8/-54) lib/lp/soyuz/doc/soyuz-upload.txt.disabled (+1/-1) lib/lp/testing/__init__.py (+3/-4)
To merge this branch:	bzr merge lp:~jml/launchpad/sftp-poppy
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Gavin Panella (community)		Approve on 2010-03-18
Michael Nelson	2010-03-18	Pending
Review via email: mp+21627@code.launchpad.net