1
=== modified file 'Makefile'
2
--- Makefile	2010-09-07 18:15:01 +0000
3
+++ Makefile	2010-10-04 22:08:24 +0000
4
@@ -253,7 +253,7 @@
5
253
253
6
254
run_codehosting: check_schema inplace stop
254
run_codehosting: check_schema inplace stop
7
255
	$(RM) thread*.request
255
	$(RM) thread*.request
9
256
	bin/run -r librarian,sftp,codebrowse -i $(LPCONFIG)
256
	bin/run -r librarian,sftp,forker,codebrowse -i $(LPCONFIG)
10
257
257
11
258
258
12
259
start_librarian: compile
259
start_librarian: compile
13
260
260
14
=== added directory 'bzrplugins/lpserve'
15
=== renamed file 'bzrplugins/lpserve.py' => 'bzrplugins/lpserve/__init__.py'
16
--- bzrplugins/lpserve.py	2010-04-19 06:35:23 +0000
17
+++ bzrplugins/lpserve/__init__.py	2010-10-04 22:08:24 +0000
18
@@ -8,15 +8,33 @@
19
8
8
20
9
__metaclass__ = type
9
__metaclass__ = type
21
10
10
25
11
__all__ = ['cmd_launchpad_server']
11
__all__ = ['cmd_launchpad_server',
26
12
12
           'cmd_launchpad_forking_service',
27
13
13
          ]
28
14
29
15
30
16
import errno
31
17
import os
32
14
import resource
18
import resource
33
19
import shlex
34
20
import shutil
35
21
import signal
36
22
import socket
37
15
import sys
23
import sys
38
24
import tempfile
39
25
import threading
40
26
import time
41
16
27
42
17
from bzrlib.commands import Command, register_command
28
from bzrlib.commands import Command, register_command
43
18
from bzrlib.option import Option
29
from bzrlib.option import Option
45
19
from bzrlib import lockdir, ui
30
from bzrlib import (
46
31
    commands,
47
32
    errors,
48
33
    lockdir,
49
34
    osutils,
50
35
    trace,
51
36
    ui,
52
37
    )
53
20
38
54
21
from bzrlib.smart import medium, server
39
from bzrlib.smart import medium, server
55
22
from bzrlib.transport import get_transport
40
from bzrlib.transport import get_transport
56
@@ -110,3 +128,724 @@
57
110
128
58
111
129
59
112
register_command(cmd_launchpad_server)
130
register_command(cmd_launchpad_server)
60
131
61
132
62
133
class LPForkingService(object):
63
134
    """A service that can be asked to start a new bzr subprocess via fork.
64
135
65
136
    The basic idea is that python startup is very expensive. For example, the
66
137
    original 'lp-serve' command could take 2.5s just to start up, before any
67
138
    actual actions could be performed.
68
139
69
140
    This class provides a service sitting on a socket, which can then be
70
141
    requested to fork and run a given bzr command.
71
142
72
143
    Clients connect to the socket and make a simple request, which then
73
144
    receives a response. The possible requests are:
74
145
75
146
        "hello\n":  Trigger a heartbeat to report that the program is still
76
147
                    running, and write status information to the log file.
77
148
        "quit\n":   Stop the service, but do so 'nicely', waiting for children
78
149
                    to exit, etc. Once this is received the service will stop
79
150
                    taking new requests on the port.
80
151
        "fork <command>\n": Request a new subprocess to be started.
81
152
            <command> is the bzr command to be run, such as "rocks" or
82
153
            "lp-serve --inet 12".
83
154
            The immediate response will be the path-on-disk to a directory full
84
155
            of named pipes (fifos) that will be the stdout/stderr/stdin of the
85
156
            new process.
86
157
            If a client holds the socket open, when the child process exits,
87
158
            the exit status (as given by 'wait()') will be written to the
88
159
            socket.
89
160
90
161
            Note that one of the key bits is that the client will not be
91
162
            started with exec*, we just call 'commands.run_bzr*()' directly.
92
163
            This way, any modules that are already loaded will not need to be
93
164
            loaded again. However, care must be taken with any global-state
94
165
            that should be reset.
95
166
    """
96
167
97
168
    # Design decisions. These are bits where we could have chosen a different
98
169
    # method/implementation and weren't sure what would be best. Documenting
99
170
    # the current decision, and the alternatives.
100
171
    #
101
172
    # [Decision #1]
102
173
    #   Serve on a named AF_UNIX socket.
103
174
    #       1) It doesn't make sense to serve to arbitrary hosts, we only want
104
175
    #          the local host to make requests. (Since the client needs to
105
176
    #          access the named fifos on the current filesystem.)
106
177
    #       2) You can set security parameters on a filesystem path (g+rw,
107
178
    #          a-rw).
108
179
    # [Decision #2]
109
180
    #   SIGCHLD
110
181
    #       We want to quickly detect that children have exited so that we can
111
182
    #       inform the client process quickly. At the moment, we register a
112
183
    #       SIGCHLD handler that doesn't do anything. However, it means that
113
184
    #       when we get the signal, if we are currently blocked in something
114
185
    #       like '.accept()', we will jump out temporarily. At that point the
115
186
    #       main loop will check if any children have exited. We could have
116
187
    #       done this work as part of the signal handler, but that felt 'racy'
117
188
    #       doing any serious work in a signal handler.
118
189
    #       If we just used socket.timeout as the indicator to go poll for
119
190
    #       children exiting, it slows the disconnect by as much as the full
120
191
    #       timeout. (So a timeout of 1.0s will cause the process to hang by
121
192
    #       that long until it determines that a child has exited, and can
122
193
    #       close the connection.)
123
194
    #       The current flow means that we'll notice exited children whenever
124
195
    #       we finish the current work.
125
196
    # [Decision #3]
126
197
    #   Child vs Parent actions.
127
198
    #       There are several actions that are done when we get a new request.
128
199
    #       We have to create the fifos on disk, fork a new child, connect the
129
200
    #       child to those handles, and inform the client of the new path (not
130
201
    #       necessarily in that order.) It makes sense to wait to send the path
131
202
    #       message until after the fifos have been created. That way the
132
203
    #       client can just try to open them immediately, and the
133
204
    #       client-and-child will be synchronized by the open() calls.
134
205
    #       However, should the client be the one doing the mkfifo, should the
135
206
    #       server? Who should be sending the message? Should we fork after the
136
207
    #       mkfifo or before.
137
208
    #       The current thoughts:
138
209
    #           1) Try to do work in the child when possible. This should allow
139
210
    #              for 'scaling' because the server is single-threaded.
140
211
    #           2) We create the directory itself in the server, because that
141
212
    #              allows the server to monitor whether the client failed to
142
213
    #              clean up after itself or not.
143
214
    #           3) Otherwise we create the fifos in the client, and then send
144
215
    #              the message back.
145
216
    # [Decision #4]
146
217
    #   Exit information
147
218
    #       Inform the client that the child has exited on the socket they used
148
219
    #       to request the fork.
149
220
    #       1) Arguably they could see that stdout and stderr have been closed,
150
221
    #          and thus stop reading. In testing, I wrote a client which uses
151
222
    #          select.poll() over stdin/stdout/stderr and used that to ferry
152
223
    #          the content to the appropriate local handle. However for the
153
224
    #          FIFOs, when the remote end closed, I wouldn't see any
154
225
    #          corresponding information on the local end. There obviously
155
226
    #          wasn't any data to be read, so they wouldn't show up as
156
227
    #          'readable' (for me to try to read, and get 0 bytes, indicating
157
228
    #          it was closed). I also wasn't seeing POLLHUP, which seemed to be
158
229
    #          the correct indicator.  As such, we decided to inform the client
159
230
    #          on the socket that they originally made the fork request, rather
160
231
    #          than just closing the socket immediately.
161
232
    #       2) We could have had the forking server close the socket, and only
162
233
    #          the child hold the socket open. When the child exits, then the
163
234
    #          OS naturally closes the socket.
164
235
    #          If we want the returncode, then we should put that as bytes on
165
236
    #          the socket before we exit. Having the child do the work means
166
237
    #          that in error conditions, it could easily die before being able to
167
238
    #          write anything (think SEGFAULT, etc). The forking server is
168
239
    #          already 'wait'() ing on its children. So that we don't get
169
240
    #          zombies, and with wait3() we can get the rusage (user time,
170
241
    #          memory consumption, etc.)
171
242
    #          As such, it seems reasonable that the server can then also
172
243
    #          report back when a child is seen as exiting.
173
244
    # [Decision #5]
174
245
    #   cleanup once connected
175
246
    #       The child process blocks during 'open()' waiting for the client to
176
247
    #       connect to its fifos. Once the client has connected, the child then
177
248
    #       deletes the temporary directory and the fifos from disk. This means
178
249
    #       that there isn't much left for diagnosis, but it also means that
179
250
    #       the client won't leave garbage around if it crashes, etc.
180
251
    #       Note that the forking service itself still monitors the paths
181
252
    #       created, and will delete garbage if it sees that a child failed to
182
253
    #       do so.
183
254
    # [Decision #6]
184
255
    #   os._exit(retcode) in the child
185
256
    #       Calling sys.exit(retcode) raises an exception, which then bubbles
186
257
    #       up the stack and runs exit functions (and finally statements). When
187
258
    #       I tried using it originally, I would see the current child bubble
188
259
    #       all the way up the stack (through the server code that it fork()
189
260
    #       through), and then get to main() returning code 0. The process
190
261
    #       would still exit nonzero. My guess is that something in the atexit
191
262
    #       functions was failing, but that it was happening after logging, etc
192
263
    #       had been shut down.
193
264
    #       Any global state from the child process should be flushed before
194
265
    #       run_bzr_* has exited (which we *do* wait for), and any other global
195
266
    #       state is probably a remnant from the service process. Which will be
196
267
    #       cleaned up by the service itself, rather than the child.
197
268
    #       There is some concern that log files may not get flushed, so we
198
269
    #       currently call sys.exitfunc() first. The main problem is that I
199
270
    #       don't know any way to *remove* a function registered via 'atexit()'
200
271
    #       so if the forking service has some state, we my try to clean it up
201
272
    #       incorrectly.
202
273
    #       Note that the bzr script itself uses sys.exitfunc(); os._exit() in
203
274
    #       the 'bzr' main script, as the teardown time of all the python state
204
275
    #       was quite noticeable in real-world runtime. As such, bzrlib should
205
276
    #       be pretty safe, or it would have been failing for people already.
206
277
    # [Decision #7]
207
278
    #   prefork vs max children vs ?
208
279
    #       For simplicity it seemed easiest to just fork when requested. Over
209
280
    #       time, I realized it would be easy to allow running an arbitrary
210
281
    #       command (no harder than just running one command), so it seemed
211
282
    #       reasonable to switch over. If we go the prefork route, then we'll
212
283
    #       need a way to tell the pre-forked children what command to run.
213
284
    #       This could be as easy as just adding one more fifo that they wait
214
285
    #       on in the same directory.
215
286
    #       For now, I've chosen not to limit the number of forked children. I
216
287
    #       don't know what a reasonable value is, and probably there are
217
288
    #       already limitations at play. (If Conch limits connections, then it
218
289
    #       will already be doing all the work, etc.)
219
290
    # [Decision #8]
220
291
    #   nicer errors on the request socket
221
292
    #       This service is meant to be run only on the local system. As such,
222
293
    #       we don't try to be extra defensive about leaking information to
223
294
    #       the one connecting to the socket. (We should still watch out what
224
295
    #       we send across the per-child fifos, since those are connected to
225
296
    #       remote clients.) Instead we try to be helpful, and tell them as
226
297
    #       much as we know about what went wrong.
227
298
228
299
    DEFAULT_PATH = '/var/run/launchpad_forking_service.sock'
229
300
    DEFAULT_PERMISSIONS = 00660 # Permissions on the master socket (rw-rw----)
230
301
    WAIT_FOR_CHILDREN_TIMEOUT = 5*60 # Wait no more than 5 min for children
231
302
    SOCKET_TIMEOUT = 1.0
232
303
    SLEEP_FOR_CHILDREN_TIMEOUT = 1.0
233
304
    WAIT_FOR_REQUEST_TIMEOUT = 1.0 # No request should take longer than this to
234
305
                                   # be read
235
306
236
307
    _fork_function = os.fork
237
308
238
309
    def __init__(self, path=DEFAULT_PATH, perms=DEFAULT_PERMISSIONS):
239
310
        self.master_socket_path = path
240
311
        self._perms = perms
241
312
        self._start_time = time.time()
242
313
        self._should_terminate = threading.Event()
243
314
        # We address these locally, in case of shutdown socket may be gc'd
244
315
        # before we are
245
316
        self._socket_timeout = socket.timeout
246
317
        self._socket_error = socket.error
247
318
        self._socket_timeout = socket.timeout
248
319
        self._socket_error = socket.error
249
320
        # Map from pid => information
250
321
        self._child_processes = {}
251
322
        self._children_spawned = 0
252
323
253
324
    def _create_master_socket(self):
254
325
        self._server_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
255
326
        self._server_socket.bind(self.master_socket_path)
256
327
        if self._perms is not None:
257
328
            os.chmod(self.master_socket_path, self._perms)
258
329
        self._server_socket.setsockopt(socket.SOL_SOCKET,
259
330
            socket.SO_REUSEADDR, 1)
260
331
        self._sockname = self._server_socket.getsockname()
261
332
        # self.host = self._sockname[0]
262
333
        self.port = self._sockname[1]
263
334
        self._server_socket.listen(5)
264
335
        self._server_socket.settimeout(self.SOCKET_TIMEOUT)
265
336
        trace.mutter('set socket timeout to: %s' % (self.SOCKET_TIMEOUT,))
266
337
267
338
    def _cleanup_master_socket(self):
268
339
        self._server_socket.close()
269
340
        try:
270
341
            os.remove(self.master_socket_path)
271
342
        except (OSError, IOError), e:
272
343
            # If we don't delete it, then we get 'address already in
273
344
            # use' failures
274
345
            trace.mutter('failed to cleanup: %s'
275
346
                         % (self.master_socket_path,))
276
347
277
348
    def _handle_sigchld(self, signum, frm):
278
349
        # We don't actually do anything here, we just want an interrupt (EINTR)
279
350
        # on socket.accept() when SIGCHLD occurs.
280
351
        pass
281
352
282
353
    def _handle_sigterm(self, signum, frm):
283
354
        # Unregister this as the default handler, 2 SIGTERMs will exit us.
284
355
        signal.signal(signal.SIGTERM, signal.SIG_DFL)
285
356
        # SIGTERM should also generate EINTR on our wait loop, so this should
286
357
        # be enough
287
358
        self._should_terminate.set()
288
359
289
360
    def _register_signals(self):
290
361
        """Register a SIGCHILD and SIGTERM handler.
291
362
292
363
        If we have a trigger for SIGCHILD then we can quickly respond to
293
364
        clients when their process exits. The main risk is getting more EAGAIN
294
365
        errors elsewhere.
295
366
296
367
        SIGTERM allows us to cleanup nicely before we exit.
297
368
        """
298
369
        signal.signal(signal.SIGCHLD, self._handle_sigchld)
299
370
        signal.signal(signal.SIGTERM, self._handle_sigterm)
300
371
301
372
    def _unregister_signals(self):
302
373
        signal.signal(signal.SIGCHLD, signal.SIG_DFL)
303
374
        signal.signal(signal.SIGTERM, signal.SIG_DFL)
304
375
305
376
    def _create_child_file_descriptors(self, base_path):
306
377
        stdin_path = os.path.join(base_path, 'stdin')
307
378
        stdout_path = os.path.join(base_path, 'stdout')
308
379
        stderr_path = os.path.join(base_path, 'stderr')
309
380
        os.mkfifo(stdin_path)
310
381
        os.mkfifo(stdout_path)
311
382
        os.mkfifo(stderr_path)
312
383
313
384
    def _bind_child_file_descriptors(self, base_path):
314
385
        import logging
315
386
        from bzrlib import ui
316
387
        stdin_path = os.path.join(base_path, 'stdin')
317
388
        stdout_path = os.path.join(base_path, 'stdout')
318
389
        stderr_path = os.path.join(base_path, 'stderr')
319
390
        # Opening for writing blocks (or fails), so do those last
320
391
        # TODO: Consider buffering, though that might interfere with reading
321
392
        #       and writing the smart protocol
322
393
        stdin_fid = os.open(stdin_path, os.O_RDONLY)
323
394
        stdout_fid = os.open(stdout_path, os.O_WRONLY)
324
395
        stderr_fid = os.open(stderr_path, os.O_WRONLY)
325
396
        # Note: by this point bzrlib has opened stderr for logging
326
397
        #       (as part of starting the service process in the first place). As
327
398
        #       such, it has a stream handler that writes to stderr. logging
328
399
        #       tries to flush and close that, but the file is already closed.
329
400
        #       This just supresses that exception
330
401
        logging.raiseExceptions = False
331
402
        sys.stdin.close()
332
403
        sys.stdout.close()
333
404
        sys.stderr.close()
334
405
        os.dup2(stdin_fid, 0)
335
406
        os.dup2(stdout_fid, 1)
336
407
        os.dup2(stderr_fid, 2)
337
408
        sys.stdin = os.fdopen(stdin_fid, 'rb')
338
409
        sys.stdout = os.fdopen(stdout_fid, 'wb')
339
410
        sys.stderr = os.fdopen(stderr_fid, 'wb')
340
411
        ui.ui_factory.stdin = sys.stdin
341
412
        ui.ui_factory.stdout = sys.stdout
342
413
        ui.ui_factory.stderr = sys.stderr
343
414
        # Now that we've opened the handles, delete everything so that we don't
344
415
        # leave garbage around. Because the open() is done in blocking mode, we
345
416
        # know that someone has already connected to them, and we don't want
346
417
        # anyone else getting confused and connecting.
347
418
        # See [Decision #5]
348
419
        os.remove(stderr_path)
349
420
        os.remove(stdout_path)
350
421
        os.remove(stdin_path)
351
422
        os.rmdir(base_path)
352
423
353
424
    def _close_child_file_descriptons(self):
354
425
        sys.stdin.close()
355
426
        sys.stderr.close()
356
427
        sys.stdout.close()
357
428
358
429
    def become_child(self, command_argv, path):
359
430
        """We are in the spawned child code, do our magic voodoo."""
360
431
        # Stop tracking new signals
361
432
        self._unregister_signals()
362
433
        # Reset the start time
363
434
        trace._bzr_log_start_time = time.time()
364
435
        trace.mutter('%d starting %r'
365
436
                     % (os.getpid(), command_argv,))
366
437
        self.host = None
367
438
        self.port = None
368
439
        self._sockname = None
369
440
        self._bind_child_file_descriptors(path)
370
441
        self._run_child_command(command_argv)
371
442
372
443
    def _run_child_command(self, command_argv):
373
444
        # This is the point where we would actually want to do something with
374
445
        # our life
375
446
        # TODO: We may want to consider special-casing the 'lp-serve' command.
376
447
        #       As that is the primary use-case for this service, it might be
377
448
        #       interesting to have an already-instantiated instance, where we
378
449
        #       can just pop on an extra argument and be ready to go. However,
379
450
        #       that would probably only really be measurable if we prefork. As
380
451
        #       it looks like ~200ms is 'fork()' time, but only 50ms is
381
452
        #       run-the-command time.
382
453
        retcode = commands.run_bzr_catch_errors(command_argv)
383
454
        self._close_child_file_descriptons()
384
455
        trace.mutter('%d finished %r'
385
456
                     % (os.getpid(), command_argv,))
386
457
        # We force os._exit() here, because we don't want to unwind the stack,
387
458
        # which has complex results. (We can get it to unwind back to the
388
459
        # cmd_launchpad_forking_service code, and even back to main() reporting
389
460
        # thereturn code, but after that, suddenly the return code changes from
390
461
        # a '0' to a '1', with no logging of info.
391
462
        # TODO: Should we call sys.exitfunc() here? it allows atexit functions
392
463
        #       to fire, however, some of those may be still around from the
393
464
        #       parent process, which we don't really want.
394
465
        sys.exitfunc()
395
466
        # See [Decision #6]
396
467
        os._exit(retcode)
397
468
398
469
    @staticmethod
399
470
    def command_to_argv(command_str):
400
471
        """Convert a 'foo bar' style command to [u'foo', u'bar']"""
401
472
        # command_str must be a utf-8 string
402
473
        return [s.decode('utf-8') for s in shlex.split(command_str)]
403
474
404
475
    @staticmethod
405
476
    def parse_env(env_str):
406
477
        """Convert the environment information into a dict.
407
478
408
479
        :param env_str: A string full of environment variable declarations.
409
480
            Each key is simple ascii "key: value\n"
410
481
            The string must end with "end\n".
411
482
        :return: A dict of environment variables
412
483
        """
413
484
        env = {}
414
485
        if not env_str.endswith('end\n'):
415
486
            raise ValueError('Invalid env-str: %r' % (env_str,))
416
487
        env_str = env_str[:-5]
417
488
        if not env_str:
418
489
            return env
419
490
        env_entries = env_str.split('\n')
420
491
        for entry in env_entries:
421
492
            key, value = entry.split(': ', 1)
422
493
            env[key] = value
423
494
        return env
424
495
425
496
    def fork_one_request(self, conn, client_addr, command_argv, env):
426
497
        """Fork myself and serve a request."""
427
498
        temp_name = tempfile.mkdtemp(prefix='lp-forking-service-child-')
428
499
        # Now that we've set everything up, send the response to the client we
429
500
        # create them first, so the client can start trying to connect to them,
430
501
        # while we fork and have the child do the same.
431
502
        self._children_spawned += 1
432
503
        pid = self._fork_function()
433
504
        if pid == 0:
434
505
            pid = os.getpid()
435
506
            trace.mutter('%d spawned' % (pid,))
436
507
            self._server_socket.close()
437
508
            for env_var, value in env.iteritems():
438
509
                osutils.set_or_unset_env(env_var, value)
439
510
            # See [Decision #3]
440
511
            self._create_child_file_descriptors(temp_name)
441
512
            conn.sendall('ok\n%d\n%s\n' % (pid, temp_name))
442
513
            conn.close()
443
514
            self.become_child(command_argv, temp_name)
444
515
            trace.warning('become_child returned!!!')
445
516
            sys.exit(1)
446
517
        else:
447
518
            self._child_processes[pid] = (temp_name, conn)
448
519
            self.log(client_addr, 'Spawned process %s for %r: %s'
449
520
                            % (pid, command_argv, temp_name))
450
521
451
522
    def main_loop(self):
452
523
        self._should_terminate.clear()
453
524
        self._register_signals()
454
525
        self._create_master_socket()
455
526
        trace.note('Listening on socket: %s' % (self.master_socket_path,))
456
527
        try:
457
528
            try:
458
529
                self._do_loop()
459
530
            finally:
460
531
                # Stop talking to others, we are shutting down
461
532
                self._cleanup_master_socket()
462
533
        except KeyboardInterrupt:
463
534
            # SIGINT received, try to shutdown cleanly
464
535
            pass
465
536
        trace.note('Shutting down. Waiting up to %.0fs for %d child processes'
466
537
                   % (self.WAIT_FOR_CHILDREN_TIMEOUT,
467
538
                      len(self._child_processes),))
468
539
        self._shutdown_children()
469
540
        trace.note('Exiting')
470
541
471
542
    def _do_loop(self):
472
543
        while not self._should_terminate.isSet():
473
544
            try:
474
545
                conn, client_addr = self._server_socket.accept()
475
546
            except self._socket_timeout:
476
547
                pass # run shutdown and children checks
477
548
            except self._socket_error, e:
478
549
                if e.args[0] == errno.EINTR:
479
550
                    pass # run shutdown and children checks
480
551
                elif e.args[0] != errno.EBADF:
481
552
                    # We can get EBADF here while we are shutting down
482
553
                    # So we just ignore it for now
483
554
                    pass
484
555
                else:
485
556
                    # Log any other failure mode
486
557
                    trace.warning("listening socket error: %s", e)
487
558
            else:
488
559
                self.log(client_addr, 'connected')
489
560
                # TODO: We should probably trap exceptions coming out of this
490
561
                #       and log them, so that we don't kill the service because
491
562
                #       of an unhandled error
492
563
                # Note: settimeout is used so that a malformed request doesn't
493
564
                #       cause us to hang forever. Note that the particular
494
565
                #       implementation means that a malicious client could
495
566
                #       probably send us one byte every Xms, and we would just
496
567
                #       keep trying to read it. However, as a local service, we
497
568
                #       aren't worrying about it.
498
569
                conn.settimeout(self.WAIT_FOR_REQUEST_TIMEOUT)
499
570
                try:
500
571
                    self.serve_one_connection(conn, client_addr)
501
572
                except self._socket_timeout, e:
502
573
                    trace.log_exception_quietly()
503
574
                    self.log(client_addr, 'request timeout failure: %s' % (e,))
504
575
                    conn.sendall('FAILURE\nrequest timed out\n')
505
576
                    conn.close()
506
577
            self._poll_children()
507
578
508
579
    def log(self, client_addr, message):
509
580
        """Log a message to the trace log.
510
581
511
582
        Include the information about what connection is being served.
512
583
        """
513
584
        if client_addr is not None:
514
585
            # Note, we don't use conn.getpeername() because if a client
515
586
            # disconnects before we get here, that raises an exception
516
587
            conn_info = '[%s] ' % (client_addr,)
517
588
        else:
518
589
            conn_info = ''
519
590
        trace.mutter('%s%s' % (conn_info, message))
520
591
521
592
    def log_information(self):
522
593
        """Log the status information.
523
594
524
595
        This includes stuff like number of children, and ... ?
525
596
        """
526
597
        self._poll_children()
527
598
        self.log(None, 'Running for %.3fs' % (time.time() - self._start_time))
528
599
        self.log(None, '%d children currently running (spawned %d total)'
529
600
                       % (len(self._child_processes), self._children_spawned))
530
601
        # Read the current information about memory consumption, etc.
531
602
        self.log(None, 'Self: %s'
532
603
                       % (resource.getrusage(resource.RUSAGE_SELF),))
533
604
        # This seems to be the sum of all rusage for all children that have
534
605
        # been collected (not for currently running children, or ones we
535
606
        # haven't "wait"ed on.) We may want to read /proc/PID/status, since
536
607
        # 'live' information is probably more useful.
537
608
        self.log(None, 'Finished children: %s'
538
609
                       % (resource.getrusage(resource.RUSAGE_CHILDREN),))
539
610
540
611
    def _poll_children(self):
541
612
        """See if children are still running, etc.
542
613
543
614
        One interesting hook here would be to track memory consumption, etc.
544
615
        """
545
616
        while self._child_processes:
546
617
            try:
547
618
                c_id, exit_code, rusage = os.wait3(os.WNOHANG)
548
619
            except OSError, e:
549
620
                if e.errno == errno.ECHILD:
550
621
                    # TODO: We handle this right now because the test suite
551
622
                    #       fakes a child, since we wanted to test some code
552
623
                    #       without actually forking anything
553
624
                    trace.mutter('_poll_children() called, and'
554
625
                        ' self._child_processes indicates there are'
555
626
                        ' children, but os.wait3() says there are not.'
556
627
                        ' current_children: %s' % (self._child_processes,))
557
628
                    return
558
629
            if c_id == 0:
559
630
                # No more children stopped right now
560
631
                return
561
632
            c_path, sock = self._child_processes.pop(c_id)
562
633
            trace.mutter('%s exited %s and usage: %s'
563
634
                         % (c_id, exit_code, rusage))
564
635
            # See [Decision #4]
565
636
            try:
566
637
                sock.sendall('exited\n%s\n' % (exit_code,))
567
638
            except (self._socket_timeout, self._socket_error), e:
568
639
                # The client disconnected before we wanted them to,
569
640
                # no big deal
570
641
                trace.mutter('%s\'s socket already closed: %s' % (c_id, e))
571
642
            else:
572
643
                sock.close()
573
644
            if os.path.exists(c_path):
574
645
                # The child failed to cleanup after itself, do the work here
575
646
                trace.warning('Had to clean up after child %d: %s\n'
576
647
                              % (c_id, c_path))
577
648
                shutil.rmtree(c_path, ignore_errors=True)
578
649
579
650
    def _wait_for_children(self, secs):
580
651
        start = time.time()
581
652
        end = start + secs
582
653
        while self._child_processes:
583
654
            self._poll_children()
584
655
            if secs > 0 and time.time() > end:
585
656
                break
586
657
            time.sleep(self.SLEEP_FOR_CHILDREN_TIMEOUT)
587
658
588
659
    def _shutdown_children(self):
589
660
        self._wait_for_children(self.WAIT_FOR_CHILDREN_TIMEOUT)
590
661
        if self._child_processes:
591
662
            trace.warning('Failed to stop children: %s'
592
663
                % ', '.join(map(str, self._child_processes)))
593
664
            for c_id in self._child_processes:
594
665
                trace.warning('sending SIGINT to %d' % (c_id,))
595
666
                os.kill(c_id, signal.SIGINT)
596
667
            # We sent the SIGINT signal, see if they exited
597
668
            self._wait_for_children(self.SLEEP_FOR_CHILDREN_TIMEOUT)
598
669
        if self._child_processes:
599
670
            # No? Then maybe something more powerful
600
671
            for c_id in self._child_processes:
601
672
                trace.warning('sending SIGKILL to %d' % (c_id,))
602
673
                os.kill(c_id, signal.SIGKILL)
603
674
            # We sent the SIGKILL signal, see if they exited
604
675
            self._wait_for_children(self.SLEEP_FOR_CHILDREN_TIMEOUT)
605
676
        if self._child_processes:
606
677
            for c_id, (c_path, sock) in self._child_processes.iteritems():
607
678
                # TODO: We should probably put something into this message?
608
679
                #       However, the likelyhood is very small that this isn't
609
680
                #       already closed because of SIGKILL + _wait_for_children
610
681
                #       And I don't really know what to say...
611
682
                sock.close()
612
683
                if os.path.exists(c_path):
613
684
                    trace.warning('Cleaning up after immortal child %d: %s\n'
614
685
                                  % (c_id, c_path))
615
686
                    shutil.rmtree(c_path)
616
687
617
688
    def _parse_fork_request(self, conn, client_addr, request):
618
689
        if request.startswith('fork-env '):
619
690
            while not request.endswith('end\n'):
620
691
                request += osutils.read_bytes_from_socket(conn)
621
692
                request = request.replace('\r\n', '\n')
622
693
            command, env = request[9:].split('\n', 1)
623
694
        else:
624
695
            command = request[5:].strip()
625
696
            env = 'end\n' # No env set
626
697
        try:
627
698
            command_argv = self.command_to_argv(command)
628
699
            env = self.parse_env(env)
629
700
        except Exception, e:
630
701
            # TODO: Log the traceback?
631
702
            self.log(client_addr, 'command or env parsing failed: %r'
632
703
                                  % (str(e),))
633
704
            conn.sendall('FAILURE\ncommand or env parsing failed: %r'
634
705
                         % (str(e),))
635
706
        else:
636
707
            return command_argv, env
637
708
        return None, None
638
709
639
710
    def serve_one_connection(self, conn, client_addr):
640
711
        request = ''
641
712
        while '\n' not in request:
642
713
            request += osutils.read_bytes_from_socket(conn)
643
714
        # telnet likes to use '\r\n' rather than '\n', and it is nice to have
644
715
        # an easy way to debug.
645
716
        request = request.replace('\r\n', '\n')
646
717
        self.log(client_addr, 'request: %r' % (request,))
647
718
        if request == 'hello\n':
648
719
            conn.sendall('ok\nyep, still alive\n')
649
720
            self.log_information()
650
721
        elif request == 'quit\n':
651
722
            self._should_terminate.set()
652
723
            conn.sendall('ok\nquit command requested... exiting\n')
653
724
        elif request.startswith('fork ') or request.startswith('fork-env '):
654
725
            command_argv, env = self._parse_fork_request(conn, client_addr,
655
726
                                                         request)
656
727
            if command_argv is not None:
657
728
                # See [Decision #7]
658
729
                # TODO: Do we want to limit the number of children? And/or
659
730
                #       prefork additional instances? (the design will need to
660
731
                #       change if we prefork and run arbitrary commands.)
661
732
                self.fork_one_request(conn, client_addr, command_argv, env)
662
733
                # We don't close the conn like other code paths, since we use
663
734
                # it again later.
664
735
                return
665
736
        else:
666
737
            self.log(client_addr, 'FAILURE: unknown request: %r' % (request,))
667
738
            # See [Decision #8]
668
739
            conn.sendall('FAILURE\nunknown request: %r\n' % (request,))
669
740
        conn.close()
670
741
671
742
672
743
class cmd_launchpad_forking_service(Command):
673
744
    """Launch a long-running process, where you can ask for new processes.
674
745
675
746
    The process will block on a given --port waiting for requests to be made.
676
747
    When a request is made, it will fork itself and redirect stdout/in/err to
677
748
    fifos on the filesystem, and start running the requested command. The
678
749
    caller will be informed where those file handles can be found. Thus it only
679
750
    makes sense that the process connecting to the port must be on the same
680
751
    system.
681
752
    """
682
753
683
754
    aliases = ['lp-service']
684
755
685
756
    takes_options = [Option('path',
686
757
                        help='Listen for connections at PATH',
687
758
                        type=str),
688
759
                     Option('perms',
689
760
                        help='Set the mode bits for the socket, interpreted'
690
761
                             ' as an octal integer (same as chmod)'),
691
762
                     Option('preload',
692
763
                        help="Do/don't preload libraries before startup."),
693
764
                     Option('children-timeout', type=int,
694
765
                        help="Only wait XX seconds for children to exit"),
695
766
                    ]
696
767
697
768
    def _preload_libraries(self):
698
769
        global libraries_to_preload
699
770
        for pyname in libraries_to_preload:
700
771
            try:
701
772
                __import__(pyname)
702
773
            except ImportError, e:
703
774
                trace.mutter('failed to preload %s: %s' % (pyname, e))
704
775
705
776
    def run(self, path=None, perms=None, preload=True,
706
777
            children_timeout=LPForkingService.WAIT_FOR_CHILDREN_TIMEOUT):
707
778
        if path is None:
708
779
            path = LPForkingService.DEFAULT_PATH
709
780
        if perms is None:
710
781
            perms = LPForkingService.DEFAULT_PERMISSIONS
711
782
        if preload:
712
783
            # We 'note' this because it often takes a fair amount of time.
713
784
            trace.note('Preloading %d modules' % (len(libraries_to_preload),))
714
785
            self._preload_libraries()
715
786
        service = LPForkingService(path, perms)
716
787
        service.WAIT_FOR_CHILDREN_TIMEOUT = children_timeout
717
788
        service.main_loop()
718
789
719
790
register_command(cmd_launchpad_forking_service)
720
791
721
792
722
793
class cmd_launchpad_replay(Command):
723
794
    """Write input from stdin back to stdout or stderr.
724
795
725
796
    This is a hidden command, primarily available for testing
726
797
    cmd_launchpad_forking_service.
727
798
    """
728
799
729
800
    hidden = True
730
801
731
802
    def run(self):
732
803
        # Just read line-by-line from stdin, and write out to stdout or stderr
733
804
        # depending on the prefix
734
805
        for line in sys.stdin:
735
806
            channel, contents = line.split(' ', 1)
736
807
            channel = int(channel)
737
808
            if channel == 1:
738
809
                sys.stdout.write(contents)
739
810
                sys.stdout.flush()
740
811
            elif channel == 2:
741
812
                sys.stderr.write(contents)
742
813
                sys.stderr.flush()
743
814
            else:
744
815
                raise RuntimeError('Invalid channel request.')
745
816
        return 0
746
817
747
818
register_command(cmd_launchpad_replay)
748
819
749
820
# This list was generated by run lsprofing a spawned child, and looking for
750
821
# <module ...> times, which indicate an import occured. Other possibilities are
751
822
# to just run "bzr lp-serve --profile-imports" manually, and observe what was
752
823
# expensive to import. It doesn't seem very easy to get this right
753
824
# automatically.
754
825
libraries_to_preload = [
755
826
    'bzrlib.errors',
756
827
    'bzrlib.repofmt.groupcompress_repo',
757
828
    'bzrlib.repository',
758
829
    'bzrlib.smart',
759
830
    'bzrlib.smart.protocol',
760
831
    'bzrlib.smart.request',
761
832
    'bzrlib.smart.server',
762
833
    'bzrlib.smart.vfs',
763
834
    'bzrlib.transport.local',
764
835
    'bzrlib.transport.readonly',
765
836
    'lp.codehosting.bzrutils',
766
837
    'lp.codehosting.vfs',
767
838
    'lp.codehosting.vfs.branchfs',
768
839
    'lp.codehosting.vfs.branchfsclient',
769
840
    'lp.codehosting.vfs.hooks',
770
841
    'lp.codehosting.vfs.transport',
771
842
    ]
772
843
773
844
774
845
775
846
def load_tests(standard_tests, module, loader):
776
847
    standard_tests.addTests(loader.loadTestsFromModuleNames(
777
848
        [__name__ + '.' + x for x in [
778
849
            'test_lpserve',
779
850
        ]]))
780
851
    return standard_tests
781
113
852
782
=== added file 'bzrplugins/lpserve/test_lpserve.py'
783
--- bzrplugins/lpserve/test_lpserve.py	1970-01-01 00:00:00 +0000
784
+++ bzrplugins/lpserve/test_lpserve.py	2010-10-04 22:08:24 +0000
785
@@ -0,0 +1,541 @@
786
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
787
2
# GNU Affero General Public License version 3 (see the file LICENSE).
788
3
789
4
import os
790
5
import signal
791
6
import socket
792
7
import subprocess
793
8
import tempfile
794
9
import threading
795
10
import time
796
11
797
12
from testtools import content
798
13
799
14
from bzrlib import (
800
15
    osutils,
801
16
    tests,
802
17
    trace,
803
18
    )
804
19
from bzrlib.plugins import lpserve
805
20
806
21
from canonical.config import config
807
22
from lp.codehosting import get_bzr_path, get_BZR_PLUGIN_PATH_for_subprocess
808
23
809
24
810
25
class TestingLPForkingServiceInAThread(lpserve.LPForkingService):
811
26
    """Wrap starting and stopping an LPForkingService instance in a thread."""
812
27
813
28
    # For testing, we set the timeouts much lower, because we want the tests to
814
29
    # run quickly
815
30
    WAIT_FOR_CHILDREN_TIMEOUT = 0.5
816
31
    SOCKET_TIMEOUT = 0.01
817
32
    SLEEP_FOR_CHILDREN_TIMEOUT = 0.01
818
33
    WAIT_FOR_REQUEST_TIMEOUT = 0.1
819
34
820
35
    _fork_function = None
821
36
822
37
    def __init__(self, path, perms=None):
823
38
        self.service_started = threading.Event()
824
39
        self.service_stopped = threading.Event()
825
40
        self.this_thread = None
826
41
        self.fork_log = []
827
42
        super(TestingLPForkingServiceInAThread, self).__init__(
828
43
            path=path, perms=None)
829
44
830
45
    def _register_signals(self):
831
46
        pass # Don't register it for the test suite
832
47
833
48
    def _unregister_signals(self):
834
49
        pass # We don't fork, and didn't register, so don't unregister
835
50
836
51
    def _create_master_socket(self):
837
52
        super(TestingLPForkingServiceInAThread, self)._create_master_socket()
838
53
        self.service_started.set()
839
54
840
55
    def main_loop(self):
841
56
        self.service_stopped.clear()
842
57
        super(TestingLPForkingServiceInAThread, self).main_loop()
843
58
        self.service_stopped.set()
844
59
845
60
    def fork_one_request(self, conn, client_addr, command, env):
846
61
        # We intentionally don't allow the test suite to request a fork, as
847
62
        # threads + forks and everything else don't exactly play well together
848
63
        self.fork_log.append((command, env))
849
64
        conn.sendall('ok\nfake forking\n')
850
65
        conn.close()
851
66
852
67
    @staticmethod
853
68
    def start_service(test):
854
69
        """Start a new LPForkingService in a thread at a random path.
855
70
856
71
        This will block until the service has created its socket, and is ready
857
72
        to communicate.
858
73
859
74
        :return: A new TestingLPForkingServiceInAThread instance
860
75
        """
861
76
        fd, path = tempfile.mkstemp(prefix='tmp-lp-forking-service-',
862
77
                                    suffix='.sock')
863
78
        # We don't want a temp file, we want a temp socket
864
79
        os.close(fd)
865
80
        os.remove(path)
866
81
        new_service = TestingLPForkingServiceInAThread(path=path)
867
82
        thread = threading.Thread(target=new_service.main_loop,
868
83
                                  name='TestingLPForkingServiceInAThread')
869
84
        new_service.this_thread = thread
870
85
        # should we be doing thread.setDaemon(True) ?
871
86
        thread.start()
872
87
        new_service.service_started.wait(10.0)
873
88
        if not new_service.service_started.isSet():
874
89
            raise RuntimeError(
875
90
                'Failed to start the TestingLPForkingServiceInAThread')
876
91
        test.addCleanup(new_service.stop_service)
877
92
        # what about returning new_service._sockname ?
878
93
        return new_service
879
94
880
95
    def stop_service(self):
881
96
        """Stop the test-server thread. This can be called multiple times."""
882
97
        if self.this_thread is None:
883
98
            # We already stopped the process
884
99
            return
885
100
        self._should_terminate.set()
886
101
        self.service_stopped.wait(10.0)
887
102
        if not self.service_stopped.isSet():
888
103
            raise RuntimeError(
889
104
                'Failed to stop the TestingLPForkingServiceInAThread')
890
105
        self.this_thread.join()
891
106
        # Break any refcycles
892
107
        self.this_thread = None
893
108
894
109
895
110
class TestTestingLPForkingServiceInAThread(tests.TestCaseWithTransport):
896
111
897
112
    def test_start_and_stop_service(self):
898
113
        service = TestingLPForkingServiceInAThread.start_service(self)
899
114
        service.stop_service()
900
115
901
116
    def test_multiple_stops(self):
902
117
        service = TestingLPForkingServiceInAThread.start_service(self)
903
118
        service.stop_service()
904
119
        service.stop_service()
905
120
906
121
    def test_autostop(self):
907
122
        # We shouldn't leak a thread here, as it should be part of the test
908
123
        # case teardown.
909
124
        service = TestingLPForkingServiceInAThread.start_service(self)
910
125
911
126
912
127
class TestCaseWithLPForkingService(tests.TestCaseWithTransport):
913
128
914
129
    def setUp(self):
915
130
        super(TestCaseWithLPForkingService, self).setUp()
916
131
        self.service = TestingLPForkingServiceInAThread.start_service(self)
917
132
918
133
    def send_message_to_service(self, message, one_byte_at_a_time=False):
919
134
        client_sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
920
135
        client_sock.connect(self.service.master_socket_path)
921
136
        if one_byte_at_a_time:
922
137
            for byte in message:
923
138
                client_sock.send(byte)
924
139
        else:
925
140
            client_sock.sendall(message)
926
141
        response = client_sock.recv(1024)
927
142
        return response
928
143
929
144
930
145
class TestLPForkingServiceCommandToArgv(tests.TestCase):
931
146
932
147
    def assertAsArgv(self, argv, command_str):
933
148
        self.assertEqual(argv,
934
149
            lpserve.LPForkingService.command_to_argv(command_str))
935
150
936
151
    def test_simple(self):
937
152
        self.assertAsArgv([u'foo'], 'foo')
938
153
        self.assertAsArgv([u'foo', u'bar'], 'foo bar')
939
154
940
155
    def test_quoted(self):
941
156
        self.assertAsArgv([u'foo'], 'foo')
942
157
        self.assertAsArgv([u'foo bar'], '"foo bar"')
943
158
944
159
    def test_unicode(self):
945
160
        self.assertAsArgv([u'command', u'\xe5'], 'command \xc3\xa5')
946
161
947
162
948
163
class TestLPForkingServiceParseEnv(tests.TestCase):
949
164
950
165
    def assertEnv(self, env, env_str):
951
166
        self.assertEqual(env, lpserve.LPForkingService.parse_env(env_str))
952
167
953
168
    def assertInvalid(self, env_str):
954
169
        self.assertRaises(ValueError, lpserve.LPForkingService.parse_env,
955
170
                                      env_str)
956
171
957
172
    def test_no_entries(self):
958
173
        self.assertEnv({}, 'end\n')
959
174
960
175
    def test_one_entries(self):
961
176
        self.assertEnv({'BZR_EMAIL': 'joe@foo.com'},
962
177
                       'BZR_EMAIL: joe@foo.com\n'
963
178
                       'end\n')
964
179
965
180
    def test_two_entries(self):
966
181
        self.assertEnv({'BZR_EMAIL': 'joe@foo.com', 'BAR': 'foo'},
967
182
                       'BZR_EMAIL: joe@foo.com\n'
968
183
                       'BAR: foo\n'
969
184
                       'end\n')
970
185
971
186
    def test_invalid_empty(self):
972
187
        self.assertInvalid('')
973
188
974
189
    def test_invalid_end(self):
975
190
        self.assertInvalid("BZR_EMAIL: joe@foo.com\n")
976
191
977
192
    def test_invalid_entry(self):
978
193
        self.assertInvalid("BZR_EMAIL joe@foo.com\nend\n")
979
194
980
195
981
196
class TestLPForkingService(TestCaseWithLPForkingService):
982
197
983
198
    def test_send_quit_message(self):
984
199
        response = self.send_message_to_service('quit\n')
985
200
        self.assertEqual('ok\nquit command requested... exiting\n', response)
986
201
        self.service.service_stopped.wait(10.0)
987
202
        self.assertTrue(self.service.service_stopped.isSet())
988
203
989
204
    def test_send_invalid_message_fails(self):
990
205
        response = self.send_message_to_service('unknown\n')
991
206
        self.assertStartsWith(response, 'FAILURE')
992
207
993
208
    def test_send_hello_heartbeat(self):
994
209
        response = self.send_message_to_service('hello\n')
995
210
        self.assertEqual('ok\nyep, still alive\n', response)
996
211
997
212
    def test_hello_supports_crlf(self):
998
213
        # telnet seems to always write in text mode. It is nice to be able to
999
214
        # debug with simple telnet, so lets support it.
1000
215
        response = self.send_message_to_service('hello\r\n')
1001
216
        self.assertEqual('ok\nyep, still alive\n', response)
1002
217
1003
218
    def test_send_simple_fork(self):
1004
219
        response = self.send_message_to_service('fork rocks\n')
1005
220
        self.assertEqual('ok\nfake forking\n', response)
1006
221
        self.assertEqual([(['rocks'], {})], self.service.fork_log)
1007
222
1008
223
    def test_send_fork_env_with_empty_env(self):
1009
224
        response = self.send_message_to_service(
1010
225
            'fork-env rocks\n'
1011
226
            'end\n')
1012
227
        self.assertEqual('ok\nfake forking\n', response)
1013
228
        self.assertEqual([(['rocks'], {})], self.service.fork_log)
1014
229
1015
230
    def test_send_fork_env_with_env(self):
1016
231
        response = self.send_message_to_service(
1017
232
            'fork-env rocks\n'
1018
233
            'BZR_EMAIL: joe@example.com\n'
1019
234
            'end\n')
1020
235
        self.assertEqual('ok\nfake forking\n', response)
1021
236
        self.assertEqual([(['rocks'], {'BZR_EMAIL': 'joe@example.com'})],
1022
237
                         self.service.fork_log)
1023
238
1024
239
    def test_send_fork_env_slowly(self):
1025
240
        response = self.send_message_to_service(
1026
241
            'fork-env rocks\n'
1027
242
            'BZR_EMAIL: joe@example.com\n'
1028
243
            'end\n', one_byte_at_a_time=True)
1029
244
        self.assertEqual('ok\nfake forking\n', response)
1030
245
        self.assertEqual([(['rocks'], {'BZR_EMAIL': 'joe@example.com'})],
1031
246
                         self.service.fork_log)
1032
247
        # It should work with 'crlf' endings as well
1033
248
        response = self.send_message_to_service(
1034
249
            'fork-env rocks\r\n'
1035
250
            'BZR_EMAIL: joe@example.com\r\n'
1036
251
            'end\r\n', one_byte_at_a_time=True)
1037
252
        self.assertEqual('ok\nfake forking\n', response)
1038
253
        self.assertEqual([(['rocks'], {'BZR_EMAIL': 'joe@example.com'}),
1039
254
                          (['rocks'], {'BZR_EMAIL': 'joe@example.com'})],
1040
255
                         self.service.fork_log)
1041
256
1042
257
    def test_send_incomplete_fork_env_timeout(self):
1043
258
        # We should get a failure message if we can't quickly read the whole
1044
259
        # content
1045
260
        response = self.send_message_to_service(
1046
261
            'fork-env rocks\n'
1047
262
            'BZR_EMAIL: joe@example.com\n',
1048
263
            one_byte_at_a_time=True)
1049
264
        # Note that we *don't* send a final 'end\n'
1050
265
        self.assertStartsWith(response, 'FAILURE\n')
1051
266
1052
267
    def test_send_incomplete_request_timeout(self):
1053
268
        # Requests end with '\n', send one without it
1054
269
        response = self.send_message_to_service('hello',
1055
270
                                                one_byte_at_a_time=True)
1056
271
        self.assertStartsWith(response, 'FAILURE\n')
1057
272
1058
273
1059
274
class TestCaseWithSubprocess(tests.TestCaseWithTransport):
1060
275
    """Override the bzr start_bzr_subprocess command.
1061
276
1062
277
    The launchpad infrastructure requires a fair amount of configuration to get
1063
278
    paths, etc correct. So this provides that work.
1064
279
    """
1065
280
1066
281
    def get_python_path(self):
1067
282
        """Return the path to the Python interpreter."""
1068
283
        return '%s/bin/py' % config.root
1069
284
1070
285
    def start_bzr_subprocess(self, process_args, env_changes=None,
1071
286
                             working_dir=None):
1072
287
        """Start bzr in a subprocess for testing.
1073
288
1074
289
        Copied and modified from `bzrlib.tests.TestCase.start_bzr_subprocess`.
1075
290
        This version removes some of the skipping stuff, some of the
1076
291
        irrelevant comments (e.g. about win32) and uses Launchpad's own
1077
292
        mechanisms for getting the path to 'bzr'.
1078
293
1079
294
        Comments starting with 'LAUNCHPAD' are comments about our
1080
295
        modifications.
1081
296
        """
1082
297
        if env_changes is None:
1083
298
            env_changes = {}
1084
299
        env_changes['BZR_PLUGIN_PATH'] = get_BZR_PLUGIN_PATH_for_subprocess()
1085
300
        old_env = {}
1086
301
1087
302
        def cleanup_environment():
1088
303
            for env_var, value in env_changes.iteritems():
1089
304
                old_env[env_var] = osutils.set_or_unset_env(env_var, value)
1090
305
1091
306
        def restore_environment():
1092
307
            for env_var, value in old_env.iteritems():
1093
308
                osutils.set_or_unset_env(env_var, value)
1094
309
1095
310
        cwd = None
1096
311
        if working_dir is not None:
1097
312
            cwd = osutils.getcwd()
1098
313
            os.chdir(working_dir)
1099
314
1100
315
        # LAUNCHPAD: Because of buildout, we need to get a custom Python
1101
316
        # binary, not sys.executable.
1102
317
        python_path = self.get_python_path()
1103
318
        # LAUNCHPAD: We can't use self.get_bzr_path(), since it'll find
1104
319
        # lib/bzrlib, rather than the path to sourcecode/bzr/bzr.
1105
320
        bzr_path = get_bzr_path()
1106
321
        try:
1107
322
            cleanup_environment()
1108
323
            command = [python_path, bzr_path]
1109
324
            command.extend(process_args)
1110
325
            process = self._popen(
1111
326
                command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
1112
327
                stderr=subprocess.PIPE)
1113
328
        finally:
1114
329
            restore_environment()
1115
330
            if cwd is not None:
1116
331
                os.chdir(cwd)
1117
332
1118
333
        return process
1119
334
1120
335
1121
336
class TestCaseWithLPForkingServiceSubprocess(TestCaseWithSubprocess):
1122
337
    """Tests will get a separate process to communicate to.
1123
338
1124
339
    The number of these tests should be small, because it is expensive to start
1125
340
    and stop the daemon.
1126
341
1127
342
    TODO: This should probably use testresources, or layers somehow...
1128
343
    """
1129
344
1130
345
    def setUp(self):
1131
346
        super(TestCaseWithLPForkingServiceSubprocess, self).setUp()
1132
347
        self.service_process, self.service_path = self.start_service_subprocess()
1133
348
        self.addCleanup(self.stop_service)
1134
349
1135
350
    def start_conversation(self, message, one_byte_at_a_time=False):
1136
351
        """Start talking to the service, and get the initial response."""
1137
352
        client_sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
1138
353
        trace.mutter('sending %r to socket %s' % (message, self.service_path))
1139
354
        client_sock.connect(self.service_path)
1140
355
        if one_byte_at_a_time:
1141
356
            for byte in message:
1142
357
                client_sock.send(byte)
1143
358
        else:
1144
359
            client_sock.sendall(message)
1145
360
        response = client_sock.recv(1024)
1146
361
        trace.mutter('response: %r' % (response,))
1147
362
        if response.startswith("FAILURE"):
1148
363
            raise RuntimeError('Failed to send message: %r' % (response,))
1149
364
        return response, client_sock
1150
365
1151
366
    def send_message_to_service(self, message, one_byte_at_a_time=False):
1152
367
        response, client_sock = self.start_conversation(message,
1153
368
            one_byte_at_a_time=one_byte_at_a_time)
1154
369
        client_sock.close()
1155
370
        return response
1156
371
1157
372
    def send_fork_request(self, command, env=None):
1158
373
        if env is not None:
1159
374
            request_lines = ['fork-env %s\n' % (command,)]
1160
375
            for key, value in env.iteritems():
1161
376
                request_lines.append('%s: %s\n' % (key, value))
1162
377
            request_lines.append('end\n')
1163
378
            request = ''.join(request_lines)
1164
379
        else:
1165
380
            request = 'fork %s\n' % (command,)
1166
381
        response, sock = self.start_conversation(request)
1167
382
        ok, pid, path, tail = response.split('\n')
1168
383
        self.assertEqual('ok', ok)
1169
384
        self.assertEqual('', tail)
1170
385
        # Don't really care what it is, but should be an integer
1171
386
        pid = int(pid)
1172
387
        path = path.strip()
1173
388
        self.assertContainsRe(path, '/lp-forking-service-child-')
1174
389
        return path, pid, sock
1175
390
1176
391
    def start_service_subprocess(self):
1177
392
        # Make sure this plugin is exposed to the subprocess
1178
393
        # SLOOWWW (~2 seconds, which is why we are doing the work anyway)
1179
394
        fd, tempname = tempfile.mkstemp(prefix='tmp-log-bzr-lp-forking-')
1180
395
        # I'm not 100% sure about when cleanup runs versus addDetail, but I
1181
396
        # think this will work.
1182
397
        self.addCleanup(os.remove, tempname)
1183
398
        def read_log():
1184
399
            f = os.fdopen(fd)
1185
400
            f.seek(0)
1186
401
            content = f.read()
1187
402
            f.close()
1188
403
            return [content]
1189
404
        self.addDetail('server-log', content.Content(
1190
405
            content.ContentType('text', 'plain', {"charset": "utf8"}),
1191
406
            read_log))
1192
407
        service_fd, path = tempfile.mkstemp(prefix='tmp-lp-service-',
1193
408
                                            suffix='.sock')
1194
409
        os.close(service_fd)
1195
410
        os.remove(path) # service wants create it as a socket
1196
411
        env_changes = {'BZR_PLUGIN_PATH': lpserve.__path__[0],
1197
412
                       'BZR_LOG': tempname}
1198
413
        proc = self.start_bzr_subprocess(
1199
414
            ['lp-service', '--path', path, '--no-preload',
1200
415
             '--children-timeout=1'],
1201
416
            env_changes=env_changes)
1202
417
        trace.mutter('started lp-service subprocess')
1203
418
        # preload_line = proc.stderr.readline()
1204
419
        # self.assertStartsWith(preload_line, 'Preloading')
1205
420
        expected = 'Listening on socket: %s\n' % (path,)
1206
421
        path_line = proc.stderr.readline()
1207
422
        trace.mutter(path_line)
1208
423
        self.assertEqual(expected, path_line)
1209
424
        # The process won't delete it, so we do
1210
425
        return proc, path
1211
426
1212
427
    def stop_service(self):
1213
428
        if self.service_process is None:
1214
429
            # Already stopped
1215
430
            return
1216
431
        # First, try to stop the service gracefully, by sending a 'quit'
1217
432
        # message
1218
433
        try:
1219
434
            response = self.send_message_to_service('quit\n')
1220
435
        except socket.error, e:
1221
436
            # Ignore a failure to connect, the service must be stopping/stopped
1222
437
            # already
1223
438
            response = None
1224
439
        tend = time.time() + 10.0
1225
440
        while self.service_process.poll() is None:
1226
441
            if time.time() > tend:
1227
442
                self.finish_bzr_subprocess(process=self.service_process,
1228
443
                    send_signal=signal.SIGINT, retcode=3)
1229
444
                self.fail('Failed to quit gracefully after 10.0 seconds')
1230
445
            time.sleep(0.1)
1231
446
        if response is not None:
1232
447
            self.assertEqual('ok\nquit command requested... exiting\n',
1233
448
                             response)
1234
449
1235
450
    def _get_fork_handles(self, path):
1236
451
        trace.mutter('getting handles for: %s' % (path,))
1237
452
        stdin_path = os.path.join(path, 'stdin')
1238
453
        stdout_path = os.path.join(path, 'stdout')
1239
454
        stderr_path = os.path.join(path, 'stderr')
1240
455
        # Consider the ordering, the other side should open 'stdin' first, but
1241
456
        # we want it to block until we open the last one, or we race and it can
1242
457
        # delete the other handles before we get to open them.
1243
458
        child_stdin = open(stdin_path, 'wb')
1244
459
        child_stdout = open(stdout_path, 'rb')
1245
460
        child_stderr = open(stderr_path, 'rb')
1246
461
        return child_stdin, child_stdout, child_stderr
1247
462
1248
463
    def communicate_with_fork(self, path, stdin=None):
1249
464
        child_stdin, child_stdout, child_stderr = self._get_fork_handles(path)
1250
465
        if stdin is not None:
1251
466
            child_stdin.write(stdin)
1252
467
        child_stdin.close()
1253
468
        stdout_content = child_stdout.read()
1254
469
        stderr_content = child_stderr.read()
1255
470
        return stdout_content, stderr_content
1256
471
1257
472
    def assertReturnCode(self, expected_code, sock):
1258
473
        """Assert that we get the expected return code as a message."""
1259
474
        response = sock.recv(1024)
1260
475
        self.assertStartsWith(response, 'exited\n')
1261
476
        code = int(response.split('\n', 1)[1])
1262
477
        self.assertEqual(expected_code, code)
1263
478
1264
479
    def test_fork_lp_serve_hello(self):
1265
480
        path, _, sock = self.send_fork_request('lp-serve --inet 2')
1266
481
        stdout_content, stderr_content = self.communicate_with_fork(path,
1267
482
            'hello\n')
1268
483
        self.assertEqual('ok\x012\n', stdout_content)
1269
484
        self.assertEqual('', stderr_content)
1270
485
        self.assertReturnCode(0, sock)
1271
486
1272
487
    def test_fork_replay(self):
1273
488
        path, _, sock = self.send_fork_request('launchpad-replay')
1274
489
        stdout_content, stderr_content = self.communicate_with_fork(path,
1275
490
            '1 hello\n2 goodbye\n1 maybe\n')
1276
491
        self.assertEqualDiff('hello\nmaybe\n', stdout_content)
1277
492
        self.assertEqualDiff('goodbye\n', stderr_content)
1278
493
        self.assertReturnCode(0, sock)
1279
494
1280
495
    def test_just_run_service(self):
1281
496
        # Start and stop are defined in setUp()
1282
497
        pass
1283
498
1284
499
    def test_fork_multiple_children(self):
1285
500
        paths = []
1286
501
        for idx in range(4):
1287
502
            paths.append(self.send_fork_request('launchpad-replay'))
1288
503
        # Do them out of order, as order shouldn't matter.
1289
504
        for idx in [3, 2, 0, 1]:
1290
505
            p, pid, sock = paths[idx]
1291
506
            stdout_msg = 'hello %d\n' % (idx,)
1292
507
            stderr_msg = 'goodbye %d\n' % (idx+1,)
1293
508
            stdout, stderr = self.communicate_with_fork(p,
1294
509
                '1 %s2 %s' % (stdout_msg, stderr_msg))
1295
510
            self.assertEqualDiff(stdout_msg, stdout)
1296
511
            self.assertEqualDiff(stderr_msg, stderr)
1297
512
            self.assertReturnCode(0, sock)
1298
513
1299
514
    def test_fork_respects_env_vars(self):
1300
515
        path, pid, sock = self.send_fork_request('whoami',
1301
516
            env={'BZR_EMAIL': 'this_test@example.com'})
1302
517
        stdout_content, stderr_content = self.communicate_with_fork(path)
1303
518
        self.assertEqual('', stderr_content)
1304
519
        self.assertEqual('this_test@example.com\n', stdout_content)
1305
520
1306
521
    def _check_exits_nicely(self, sig_id):
1307
522
        path, _, sock = self.send_fork_request('rocks')
1308
523
        self.assertEqual(None, self.service_process.poll())
1309
524
        # Now when we send SIGTERM, it should wait for the child to exit,
1310
525
        # before it tries to exit itself.
1311
526
        # In python2.6+ we could use self.service_process.terminate()
1312
527
        os.kill(self.service_process.pid, sig_id)
1313
528
        self.assertEqual(None, self.service_process.poll())
1314
529
        # Now talk to the child, so the service can close
1315
530
        stdout_content, stderr_content = self.communicate_with_fork(path)
1316
531
        self.assertEqual('It sure does!\n', stdout_content)
1317
532
        self.assertEqual('', stderr_content)
1318
533
        self.assertReturnCode(0, sock)
1319
534
        # And the process should exit cleanly
1320
535
        self.assertEqual(0, self.service_process.wait())
1321
536
1322
537
    def test_sigterm_exits_nicely(self):
1323
538
        self._check_exits_nicely(signal.SIGTERM)
1324
539
1325
540
    def test_sigint_exits_nicely(self):
1326
541
        self._check_exits_nicely(signal.SIGINT)
1327
0
542
1328
=== modified file 'configs/development/launchpad-lazr.conf'
1329
--- configs/development/launchpad-lazr.conf	2010-09-20 21:35:21 +0000
1330
+++ configs/development/launchpad-lazr.conf	2010-10-04 22:08:24 +0000
1331
@@ -76,6 +76,7 @@
1332
76
lp_url_hosts: dev
76
lp_url_hosts: dev
1333
77
access_log: /var/tmp/bazaar.launchpad.dev/codehosting-access.log
77
access_log: /var/tmp/bazaar.launchpad.dev/codehosting-access.log
1334
78
blacklisted_hostnames:
78
blacklisted_hostnames:
1335
79
use_forking_daemon: True
1336
79
80
1337
80
[codeimport]
81
[codeimport]
1338
81
bazaar_branch_store: file:///tmp/bazaar-branches
82
bazaar_branch_store: file:///tmp/bazaar-branches
1339
82
83
1340
=== modified file 'database/replication/Makefile'
1341
--- database/replication/Makefile	2010-07-26 08:12:20 +0000
1342
+++ database/replication/Makefile	2010-10-04 22:08:24 +0000
1343
@@ -14,8 +14,9 @@
1344
14
# To test the staging rebuild script:
14
# To test the staging rebuild script:
1345
15
#
15
#
1346
16
#  $ cd database/replication
16
#  $ cd database/replication
1349
17
#  $ pg_dump --format=c launchpad_dev > launchpad.dump
17
#  $ pg_dump --format=c launchpad_dev | bzip2 -c > launchpad.dump.bz2
1350
18
#  $ make stagingsetup STAGING_CONFIG=dev-staging STAGING_DUMP=launchpad.dump
18
#  $ make stagingsetup \
1351
19
#        STAGING_CONFIG=dev-staging STAGING_DUMP=launchpad.dump.bz2
1352
19
#  $ make stagingswitch STAGING_CONFIG=dev-staging
20
#  $ make stagingswitch STAGING_CONFIG=dev-staging
1353
20
#
21
#
1354
21
# To restore a dogfood database:
22
# To restore a dogfood database:
1355
@@ -46,7 +47,12 @@
1356
46
47
1357
47
CREATEDB_83=createdb --encoding=UTF8
48
CREATEDB_83=createdb --encoding=UTF8
1358
48
CREATEDB_84=createdb --encoding=UTF8 --locale=C --template=template0
49
CREATEDB_84=createdb --encoding=UTF8 --locale=C --template=template0
1360
49
CREATEDB=${CREATEDB_83}
50
CREATEDB=${CREATEDB_84}
1361
51
1362
52
# Set this to --exit-on-error once our dumps are coming from a PG 8.4
1363
53
# source. Currently, the PG 8.3 dumps generate some spurious errors
1364
54
# when being restored into a PG 8.4 database.
1365
55
EXIT_ON_ERROR=
1366
50
56
1367
51
# Turn off output silencing so we can see details of staging deployments.
57
# Turn off output silencing so we can see details of staging deployments.
1368
52
# Without the timestamps, we are unable to estimate production deployment
58
# Without the timestamps, we are unable to estimate production deployment
1369
@@ -102,8 +108,9 @@
1370
102
	# Restore the database. We need to restore permissions, despite
108
	# Restore the database. We need to restore permissions, despite
1371
103
	# later running security.py, to pull in permissions granted on
109
	# later running security.py, to pull in permissions granted on
1372
104
	# production to users not maintained by security.py.
110
	# production to users not maintained by security.py.
1375
105
	bunzip2 --stdout ${STAGING_DUMP} | \
111
	# Stop ignoring error code after dumps come from an 8.4 system.
1376
106
	    pg_restore --dbname=lpmain_staging_new --no-owner --exit-on-error
112
	-bunzip2 --stdout ${STAGING_DUMP} | \
1377
113
	    pg_restore --dbname=lpmain_staging_new --no-owner ${EXIT_ON_ERROR}
1378
107
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
114
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
1379
108
	# Slony-I installed isn't usable without this step.
115
	# Slony-I installed isn't usable without this step.
1380
109
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
116
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
1381
@@ -136,8 +143,9 @@
1382
136
143
1383
137
dogfood:
144
dogfood:
1384
138
	${CREATEDB} ${DOGFOOD_DBNAME}
145
	${CREATEDB} ${DOGFOOD_DBNAME}
1387
139
	pg_restore --dbname=${DOGFOOD_DBNAME} --no-acl --no-owner \
146
	# Stop ignoring error code after are dumps come from an 8.4 system.
1388
140
	    --exit-on-error ${DOGFOOD_DUMP}
147
	-pg_restore --dbname=${DOGFOOD_DBNAME} --no-acl --no-owner \
1389
148
	    ${EXIT_ON_ERROR} ${DOGFOOD_DUMP}
1390
141
	./repair-restored-db.py -d ${DOGFOOD_DBNAME}
149
	./repair-restored-db.py -d ${DOGFOOD_DBNAME}
1391
142
	../schema/upgrade.py -d ${DOGFOOD_DBNAME}
150
	../schema/upgrade.py -d ${DOGFOOD_DBNAME}
1392
143
	../schema/fti.py -d ${DOGFOOD_DBNAME}
151
	../schema/fti.py -d ${DOGFOOD_DBNAME}
1393
144
152
1394
=== modified file 'database/replication/slon_ctl.py'
1395
--- database/replication/slon_ctl.py	2010-05-19 18:07:56 +0000
1396
+++ database/replication/slon_ctl.py	2010-10-04 22:08:24 +0000
1397
@@ -88,9 +88,11 @@
1398
88
88
1399
89
89
1400
90
def get_logfile(nickname):
90
def get_logfile(nickname):
1401
91
    logdir = config.database.replication_logdir
1402
92
    if not os.path.isabs(logdir):
1403
93
        logdir = os.path.normpath(os.path.join(config.root, logdir))
1404
91
    return os.path.join(
94
    return os.path.join(
1407
92
        config.root, 'database', 'replication',
95
        logdir, 'lpslon_%s_%s.log' % (nickname, config.instance_name))
1406
93
        'lpslon_%s_%s.log' % (nickname, config.instance_name))
1408
94
96
1409
95
97
1410
96
def start(log, nodes, lag=None):
98
def start(log, nodes, lag=None):
1411
97
99
1412
=== modified file 'database/sampledata/current-dev.sql'
1413
--- database/sampledata/current-dev.sql	2010-09-23 19:10:34 +0000
1414
+++ database/sampledata/current-dev.sql	2010-10-04 22:08:24 +0000
1415
@@ -1837,14 +1837,14 @@
1416
1837
1837
1417
1838
ALTER TABLE distroarchseries DISABLE TRIGGER ALL;
1838
ALTER TABLE distroarchseries DISABLE TRIGGER ALL;
1418
1839
1839
1427
1840
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (1, 1, 1, 'i386', 1, true, 5, '2006-10-16 18:31:43.454475', true);
1840
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (1, 1, 1, 'i386', 1, true, 5, '2006-10-16 18:31:43.454475', true, true);
1428
1841
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (6, 3, 1, 'i386', 1, true, 1, '2006-10-16 18:31:43.456532', true);
1841
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (6, 3, 1, 'i386', 1, true, 1, '2006-10-16 18:31:43.456532', true, true);
1429
1842
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (7, 6, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457028', true);
1842
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (7, 6, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457028', true, true);
1430
1843
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (8, 10, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457484', true);
1843
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (8, 10, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457484', true, true);
1431
1844
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (9, 13, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457938', true);
1844
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (9, 13, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457938', true, true);
1432
1845
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (10, 13, 3, 'amd64', 1, true, 0, '2006-10-16 18:31:43.458434', true);
1845
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (10, 13, 3, 'amd64', 1, true, 0, '2006-10-16 18:31:43.458434', true, true);
1433
1846
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (11, 3, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.458892', false);
1846
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (11, 3, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.458892', false, true);
1434
1847
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (12, 1, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.459349', false);
1847
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (12, 1, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.459349', false, true);
1435
1848
1848
1436
1849
1849
1437
1850
ALTER TABLE distroarchseries ENABLE TRIGGER ALL;
1850
ALTER TABLE distroarchseries ENABLE TRIGGER ALL;
1438
@@ -3092,25 +3092,25 @@
1439
3092
3092
1440
3093
ALTER TABLE branchrevision DISABLE TRIGGER ALL;
3093
ALTER TABLE branchrevision DISABLE TRIGGER ALL;
1441
3094
3094
1461
3095
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (1, 1, 10, 1);
3095
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 10, 1);
1462
3096
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (2, 1, 11, 2);
3096
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 11, 2);
1463
3097
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (3, 1, 12, 3);
3097
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 12, 3);
1464
3098
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (4, 1, 20, 4);
3098
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 20, 4);
1465
3099
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (5, 2, 20, 5);
3099
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 21, 4);
1466
3100
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (6, 3, 20, 6);
3100
INSERT INTO branchrevision (sequence, branch, revision) VALUES (2, 20, 5);
1467
3101
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (7, 4, 20, 7);
3101
INSERT INTO branchrevision (sequence, branch, revision) VALUES (2, 21, 5);
1468
3102
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (8, 5, 20, 8);
3102
INSERT INTO branchrevision (sequence, branch, revision) VALUES (3, 20, 6);
1469
3103
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (9, 6, 20, 9);
3103
INSERT INTO branchrevision (sequence, branch, revision) VALUES (3, 21, 10);
1470
3104
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (10, 1, 21, 4);
3104
INSERT INTO branchrevision (sequence, branch, revision) VALUES (4, 20, 7);
1471
3105
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (11, 2, 21, 5);
3105
INSERT INTO branchrevision (sequence, branch, revision) VALUES (4, 21, 11);
1472
3106
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (12, 3, 21, 10);
3106
INSERT INTO branchrevision (sequence, branch, revision) VALUES (5, 20, 8);
1473
3107
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (13, 4, 21, 11);
3107
INSERT INTO branchrevision (sequence, branch, revision) VALUES (5, 21, 8);
1474
3108
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (14, 5, 21, 8);
3108
INSERT INTO branchrevision (sequence, branch, revision) VALUES (6, 20, 9);
1475
3109
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (15, 6, 21, 9);
3109
INSERT INTO branchrevision (sequence, branch, revision) VALUES (6, 21, 9);
1476
3110
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (16, NULL, 20, 10);
3110
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 20, 10);
1477
3111
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (17, NULL, 20, 11);
3111
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 20, 11);
1478
3112
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (18, NULL, 21, 6);
3112
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 21, 6);
1479
3113
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (19, NULL, 21, 7);
3113
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 21, 7);
1480
3114
3114
1481
3115
3115
1482
3116
ALTER TABLE branchrevision ENABLE TRIGGER ALL;
3116
ALTER TABLE branchrevision ENABLE TRIGGER ALL;
1483
@@ -3333,42 +3333,42 @@
1484
3333
3333
1485
3334
ALTER TABLE bugmessage DISABLE TRIGGER ALL;
3334
ALTER TABLE bugmessage DISABLE TRIGGER ALL;
1486
3335
3335
1523
3336
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (1, 2, 1, NULL, NULL, true);
3336
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (1, 2, 1, NULL, NULL, true, NULL);
1524
3337
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (2, 1, 3, NULL, NULL, true);
3337
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (2, 1, 3, NULL, NULL, true, NULL);
1525
3338
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (3, 1, 4, NULL, NULL, true);
3338
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (3, 1, 4, NULL, NULL, true, NULL);
1526
3339
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (4, 2, 5, NULL, NULL, true);
3339
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (4, 2, 5, NULL, NULL, true, NULL);
1527
3340
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (5, 2, 6, NULL, NULL, true);
3340
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (5, 2, 6, NULL, NULL, true, NULL);
1528
3341
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (6, 4, 7, NULL, NULL, true);
3341
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (6, 4, 7, NULL, NULL, true, NULL);
1529
3342
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (7, 5, 8, NULL, NULL, true);
3342
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (7, 5, 8, NULL, NULL, true, NULL);
1530
3343
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (8, 6, 9, NULL, NULL, true);
3343
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (8, 6, 9, NULL, NULL, true, NULL);
1531
3344
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (9, 3, 10, NULL, NULL, true);
3344
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (9, 3, 10, NULL, NULL, true, NULL);
1532
3345
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (10, 7, 11, NULL, NULL, true);
3345
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (10, 7, 11, NULL, NULL, true, NULL);
1533
3346
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (11, 8, 14, NULL, NULL, true);
3346
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (11, 8, 14, NULL, NULL, true, NULL);
1534
3347
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (12, 9, 15, NULL, NULL, true);
3347
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (12, 9, 15, NULL, NULL, true, NULL);
1535
3348
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (13, 10, 17, NULL, NULL, true);
3348
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (13, 10, 17, NULL, NULL, true, NULL);
1536
3349
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (14, 10, 16, NULL, NULL, true);
3349
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (14, 10, 16, NULL, NULL, true, NULL);
1537
3350
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (15, 11, 24, NULL, NULL, true);
3350
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (15, 11, 24, NULL, NULL, true, NULL);
1538
3351
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (16, 11, 25, NULL, NULL, true);
3351
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (16, 11, 25, NULL, NULL, true, NULL);
1539
3352
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (17, 11, 26, NULL, NULL, true);
3352
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (17, 11, 26, NULL, NULL, true, NULL);
1540
3353
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (18, 11, 27, NULL, NULL, true);
3353
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (18, 11, 27, NULL, NULL, true, NULL);
1541
3354
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (19, 11, 28, NULL, NULL, true);
3354
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (19, 11, 28, NULL, NULL, true, NULL);
1542
3355
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (20, 11, 29, NULL, NULL, true);
3355
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (20, 11, 29, NULL, NULL, true, NULL);
1543
3356
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (21, 11, 30, NULL, NULL, true);
3356
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (21, 11, 30, NULL, NULL, true, NULL);
1544
3357
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (22, 12, 31, NULL, NULL, true);
3357
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (22, 12, 31, NULL, NULL, true, NULL);
1545
3358
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (23, 12, 33, NULL, NULL, true);
3358
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (23, 12, 33, NULL, NULL, true, NULL);
1546
3359
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (24, 12, 34, NULL, NULL, true);
3359
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (24, 12, 34, NULL, NULL, true, NULL);
1547
3360
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (25, 12, 35, NULL, NULL, true);
3360
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (25, 12, 35, NULL, NULL, true, NULL);
1548
3361
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (26, 12, 36, NULL, NULL, true);
3361
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (26, 12, 36, NULL, NULL, true, NULL);
1549
3362
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (27, 13, 37, NULL, NULL, true);
3362
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (27, 13, 37, NULL, NULL, true, NULL);
1550
3363
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (28, 13, 38, NULL, NULL, true);
3363
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (28, 13, 38, NULL, NULL, true, NULL);
1551
3364
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (29, 14, 39, NULL, NULL, true);
3364
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (29, 14, 39, NULL, NULL, true, NULL);
1552
3365
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (30, 15, 40, NULL, NULL, true);
3365
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (30, 15, 40, NULL, NULL, true, NULL);
1553
3366
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true);
3366
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true, NULL);
1554
3367
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true);
3367
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true, NULL);
1555
3368
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true);
3368
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true, NULL);
1556
3369
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true);
3369
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true, NULL);
1557
3370
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true);
3370
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true, NULL);
1558
3371
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true);
3371
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true, NULL);
1559
3372
3372
1560
3373
3373
1561
3374
ALTER TABLE bugmessage ENABLE TRIGGER ALL;
3374
ALTER TABLE bugmessage ENABLE TRIGGER ALL;
1562
@@ -3792,6 +3792,27 @@
1563
3792
ALTER TABLE bugtrackeralias ENABLE TRIGGER ALL;
3792
ALTER TABLE bugtrackeralias ENABLE TRIGGER ALL;
1564
3793
3793
1565
3794
3794
1566
3795
ALTER TABLE bugtrackercomponentgroup DISABLE TRIGGER ALL;
1567
3796
1568
3797
1569
3798
1570
3799
ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;
1571
3800
1572
3801
1573
3802
ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
1574
3803
1575
3804
1576
3805
1577
3806
ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
1578
3807
1579
3808
1580
3809
ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;
1581
3810
1582
3811
1583
3812
1584
3813
ALTER TABLE bugtrackercomponent ENABLE TRIGGER ALL;
1585
3814
1586
3815
1587
3795
ALTER TABLE bugtrackerperson DISABLE TRIGGER ALL;
3816
ALTER TABLE bugtrackerperson DISABLE TRIGGER ALL;
1588
3796
3817
1589
3797
3818
1590
@@ -3993,6 +4014,13 @@
1591
3993
ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
4014
ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
1592
3994
4015
1593
3995
4016
1594
4017
ALTER TABLE distributionjob DISABLE TRIGGER ALL;
1595
4018
1596
4019
1597
4020
1598
4021
ALTER TABLE distributionjob ENABLE TRIGGER ALL;
1599
4022
1600
4023
1601
3996
ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
4024
ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
1602
3997
4025
1603
3998
INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
4026
INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
1604
@@ -4010,13 +4038,6 @@
1605
4010
ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
4038
ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
1606
4011
4039
1607
4012
4040
1608
4013
ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
1609
4014
1610
4015
1611
4016
1612
4017
ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
1613
4018
1614
4019
1615
4020
ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
4041
ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
1616
4021
4042
1617
4022
INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
4043
INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
1618
@@ -4567,6 +4588,13 @@
1619
4567
ALTER TABLE hwtestanswerdevice ENABLE TRIGGER ALL;
4588
ALTER TABLE hwtestanswerdevice ENABLE TRIGGER ALL;
1620
4568
4589
1621
4569
4590
1622
4591
ALTER TABLE incrementaldiff DISABLE TRIGGER ALL;
1623
4592
1624
4593
1625
4594
1626
4595
ALTER TABLE incrementaldiff ENABLE TRIGGER ALL;
1627
4596
1628
4597
1629
4570
ALTER TABLE ircid DISABLE TRIGGER ALL;
4598
ALTER TABLE ircid DISABLE TRIGGER ALL;
1630
4571
4599
1631
4572
INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
4600
INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
1632
@@ -11141,6 +11169,13 @@
1633
11141
ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;
11169
ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;
1634
11142
11170
1635
11143
11171
1636
11172
ALTER TABLE translationtemplatesbuild DISABLE TRIGGER ALL;
1637
11173
1638
11174
1639
11175
1640
11176
ALTER TABLE translationtemplatesbuild ENABLE TRIGGER ALL;
1641
11177
1642
11178
1643
11144
ALTER TABLE translator DISABLE TRIGGER ALL;
11179
ALTER TABLE translator DISABLE TRIGGER ALL;
1644
11145
11180
1645
11146
INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);
11181
INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);
1646
11147
11182
1647
=== modified file 'database/sampledata/current.sql'
1648
--- database/sampledata/current.sql	2010-09-04 20:38:35 +0000
1649
+++ database/sampledata/current.sql	2010-10-04 22:08:24 +0000
1650
@@ -792,6 +792,36 @@
1651
792
792
1652
793
793
1653
794
794
1654
795
1655
796
1656
797
1657
798
1658
799
1659
800
1660
801
1661
802
1662
803
1663
804
1664
805
1665
806
1666
807
1667
808
1668
809
1669
810
1670
811
1671
812
1672
813
1673
814
1674
815
1675
816
1676
817
1677
818
1678
819
1679
820
1680
821
1681
822
1682
823
1683
824
1684
795
SET SESSION AUTHORIZATION DEFAULT;
825
SET SESSION AUTHORIZATION DEFAULT;
1685
796
826
1686
797
ALTER TABLE account DISABLE TRIGGER ALL;
827
ALTER TABLE account DISABLE TRIGGER ALL;
1687
@@ -1819,14 +1849,14 @@
1688
1819
1849
1689
1820
ALTER TABLE distroarchseries DISABLE TRIGGER ALL;
1850
ALTER TABLE distroarchseries DISABLE TRIGGER ALL;
1690
1821
1851
1699
1822
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (1, 1, 1, 'i386', 1, true, 5, '2006-10-16 18:31:43.454475', true);
1852
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (1, 1, 1, 'i386', 1, true, 5, '2006-10-16 18:31:43.454475', true, true);
1700
1823
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (6, 3, 1, 'i386', 1, true, 1, '2006-10-16 18:31:43.456532', true);
1853
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (6, 3, 1, 'i386', 1, true, 1, '2006-10-16 18:31:43.456532', true, true);
1701
1824
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (7, 6, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457028', true);
1854
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (7, 6, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457028', true, true);
1702
1825
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (8, 10, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457484', true);
1855
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (8, 10, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457484', true, true);
1703
1826
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (9, 13, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457938', true);
1856
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (9, 13, 1, 'i386', 1, true, 0, '2006-10-16 18:31:43.457938', true, true);
1704
1827
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (10, 13, 3, 'amd64', 1, true, 0, '2006-10-16 18:31:43.458434', true);
1857
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (10, 13, 3, 'amd64', 1, true, 0, '2006-10-16 18:31:43.458434', true, true);
1705
1828
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (11, 3, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.458892', false);
1858
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (11, 3, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.458892', false, true);
1706
1829
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized) VALUES (12, 1, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.459349', false);
1859
INSERT INTO distroarchseries (id, distroseries, processorfamily, architecturetag, owner, official, package_count, date_created, supports_virtualized, enabled) VALUES (12, 1, 4, 'hppa', 1, false, 0, '2006-10-16 18:31:43.459349', false, true);
1707
1830
1860
1708
1831
1861
1709
1832
ALTER TABLE distroarchseries ENABLE TRIGGER ALL;
1862
ALTER TABLE distroarchseries ENABLE TRIGGER ALL;
1710
@@ -2238,8 +2268,8 @@
1711
2238
2268
1712
2239
ALTER TABLE builder DISABLE TRIGGER ALL;
2269
ALTER TABLE builder DISABLE TRIGGER ALL;
1713
2240
2270
1716
2241
INSERT INTO builder (id, processor, name, title, description, owner, speedindex, builderok, failnotes, virtualized, url, manual, date_created, vm_host, active) VALUES (1, 1, 'bob', 'Bob The Builder', 'The default build-slave', 61, NULL, true, NULL, false, 'http://localhost:8221/', false, '2006-10-16 18:31:43.226724', NULL, true);
2271
INSERT INTO builder (id, processor, name, title, description, owner, speedindex, builderok, failnotes, virtualized, url, manual, date_created, vm_host, active, failure_count) VALUES (1, 1, 'bob', 'Bob The Builder', 'The default build-slave', 61, NULL, true, NULL, false, 'http://localhost:8221/', false, '2006-10-16 18:31:43.226724', NULL, true, 0);
1717
2242
INSERT INTO builder (id, processor, name, title, description, owner, speedindex, builderok, failnotes, virtualized, url, manual, date_created, vm_host, active) VALUES (2, 1, 'frog', 'The frog builder', 'The untrusted build-slave', 61, NULL, false, NULL, true, 'http://localhost:9221/', false, '2006-10-31 18:31:43.226724', 'localhost-host.ppa', true);
2272
INSERT INTO builder (id, processor, name, title, description, owner, speedindex, builderok, failnotes, virtualized, url, manual, date_created, vm_host, active, failure_count) VALUES (2, 1, 'frog', 'The frog builder', 'The untrusted build-slave', 61, NULL, false, NULL, true, 'http://localhost:9221/', false, '2006-10-31 18:31:43.226724', 'localhost-host.ppa', true, 0);
1718
2243
2273
1719
2244
2274
1720
2245
ALTER TABLE builder ENABLE TRIGGER ALL;
2275
ALTER TABLE builder ENABLE TRIGGER ALL;
1721
@@ -2247,30 +2277,30 @@
1722
2247
2277
1723
2248
ALTER TABLE buildfarmjob DISABLE TRIGGER ALL;
2278
ALTER TABLE buildfarmjob DISABLE TRIGGER ALL;
1724
2249
2279
1749
2250
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (2, 1, false, '2004-09-27 11:57:13', '2004-09-27 11:55:13', '2004-09-27 11:57:14', NULL, 1, 1, 1, 1);
2280
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (2, 1, false, '2004-09-27 11:57:13', '2004-09-27 11:55:13', '2004-09-27 11:57:14', NULL, 1, 1, 1, 1, 0);
1750
2251
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (6, 1, false, '2006-12-01 00:00:00', '2006-12-01 00:00:00', '2006-12-01 00:00:01', NULL, 1, 2, 1, 1);
2281
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (6, 1, false, '2006-12-01 00:00:00', '2006-12-01 00:00:00', '2006-12-01 00:00:01', NULL, 1, 2, 1, 1, 0);
1751
2252
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (7, 1, false, '2005-03-24 00:00:00', '2005-03-24 23:58:43', '2005-03-25 00:00:03', NULL, 1, 1, 1, 1);
2282
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (7, 1, false, '2005-03-24 00:00:00', '2005-03-24 23:58:43', '2005-03-25 00:00:03', NULL, 1, 1, 1, 1, 0);
1752
2253
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (8, 1, false, '2005-09-30 00:00:00', NULL, NULL, NULL, NULL, 6, NULL, 1);
2283
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (8, 1, false, '2005-09-30 00:00:00', NULL, NULL, NULL, NULL, 6, NULL, 1, 0);
1753
2254
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (9, 1, false, '2005-10-01 00:00:00', '2005-10-01 23:56:41', '2005-10-02 00:00:01', NULL, 1, 2, 1, 1);
2284
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (9, 1, false, '2005-10-01 00:00:00', '2005-10-01 23:56:41', '2005-10-02 00:00:01', NULL, 1, 2, 1, 1, 0);
1754
2255
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (10, 1, false, '2006-01-27 00:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1);
2285
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (10, 1, false, '2006-01-27 00:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1, 0);
1755
2256
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (11, 1, false, '2006-02-14 00:00:00', NULL, NULL, NULL, NULL, 0, NULL, 1);
2286
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (11, 1, false, '2006-02-14 00:00:00', NULL, NULL, NULL, NULL, 0, NULL, 1, 0);
1756
2257
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (12, 1, false, '2006-02-28 00:00:00', '2006-02-27 23:53:59', '2006-02-28 00:00:01', NULL, 1, 3, 1, 1);
2287
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (12, 1, false, '2006-02-28 00:00:00', '2006-02-27 23:53:59', '2006-02-28 00:00:01', NULL, 1, 3, 1, 1, 0);
1757
2258
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (13, 1, false, '2006-03-21 00:00:00', '2006-03-21 00:58:33', '2006-03-21 01:00:03', NULL, 1, 5, 1, 1);
2288
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (13, 1, false, '2006-03-21 00:00:00', '2006-03-21 00:58:33', '2006-03-21 01:00:03', NULL, 1, 5, 1, 1, 0);
1758
2259
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (14, 1, false, '2006-03-22 00:00:00', '2006-03-21 00:58:32', '2006-03-21 01:00:02', NULL, 1, 5, 1, 1);
2289
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (14, 1, false, '2006-03-22 00:00:00', '2006-03-21 00:58:32', '2006-03-21 01:00:02', NULL, 1, 5, 1, 1, 0);
1759
2260
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (15, 1, false, '2006-03-22 00:00:01', '2006-03-21 00:58:30', '2006-03-21 01:00:00', NULL, 1, 5, 1, 1);
2290
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (15, 1, false, '2006-03-22 00:00:01', '2006-03-21 00:58:30', '2006-03-21 01:00:00', NULL, 1, 5, 1, 1, 0);
1760
2261
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (16, 1, false, '2005-03-24 00:00:01', '2005-03-24 23:58:42', '2005-03-25 00:00:02', NULL, 1, 1, 1, 1);
2291
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (16, 1, false, '2005-03-24 00:00:01', '2005-03-24 23:58:42', '2005-03-25 00:00:02', NULL, 1, 1, 1, 1, 0);
1761
2262
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (18, 1, false, '2004-09-27 11:57:14', '2004-09-27 11:55:12', '2004-09-27 11:57:13', NULL, 1, 1, 1, 1);
2292
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (18, 1, false, '2004-09-27 11:57:14', '2004-09-27 11:55:12', '2004-09-27 11:57:13', NULL, 1, 1, 1, 1, 0);
1762
2263
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (19, 1, false, '2005-03-24 00:00:02', '2005-03-24 23:58:41', '2005-03-25 00:00:01', NULL, 1, 1, 1, 1);
2293
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (19, 1, false, '2005-03-24 00:00:02', '2005-03-24 23:58:41', '2005-03-25 00:00:01', NULL, 1, 1, 1, 1, 0);
1763
2264
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (21, 1, false, '2006-12-01 00:00:01', NULL, NULL, NULL, NULL, 2, NULL, 1);
2294
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (21, 1, false, '2006-12-01 00:00:01', NULL, NULL, NULL, NULL, 2, NULL, 1, 0);
1764
2265
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (22, 1, false, '2007-04-20 00:00:00', '2007-04-19 23:58:41', '2007-04-20 00:00:01', NULL, 1, 7, 1, 1);
2295
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (22, 1, false, '2007-04-20 00:00:00', '2007-04-19 23:58:41', '2007-04-20 00:00:01', NULL, 1, 7, 1, 1, 0);
1765
2266
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (23, 1, false, '2006-04-11 12:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1);
2296
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (23, 1, false, '2006-04-11 12:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1, 0);
1766
2267
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (24, 1, true, '2007-05-30 00:00:00', '2007-05-29 23:58:41', '2007-05-30 00:00:01', NULL, 1, 2, 1, 1);
2297
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (24, 1, true, '2007-05-30 00:00:00', '2007-05-29 23:58:41', '2007-05-30 00:00:01', NULL, 1, 2, 1, 1, 0);
1767
2268
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (25, 1, true, '2007-07-08 12:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1);
2298
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (25, 1, true, '2007-07-08 12:00:00', NULL, NULL, NULL, NULL, 1, NULL, 1, 0);
1768
2269
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (26, 1, true, '2007-07-08 00:00:00', '2007-07-07 23:58:41', '2007-07-08 00:00:01', NULL, 1, 2, 1, 1);
2299
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (26, 1, true, '2007-07-08 00:00:00', '2007-07-07 23:58:41', '2007-07-08 00:00:01', NULL, 1, 2, 1, 1, 0);
1769
2270
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (27, 1, true, '2007-07-24 00:00:00', '2007-07-23 23:58:41', '2007-07-24 00:00:01', NULL, 1, 1, 1, 1);
2300
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (27, 1, true, '2007-07-24 00:00:00', '2007-07-23 23:58:41', '2007-07-24 00:00:01', NULL, 1, 1, 1, 1, 0);
1770
2271
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (28, 3, true, '2007-08-10 00:00:00', '2007-08-10 00:00:00', '2007-08-10 00:00:13', NULL, 1, 1, 1, 1);
2301
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (28, 3, true, '2007-08-10 00:00:00', '2007-08-10 00:00:00', '2007-08-10 00:00:13', NULL, 1, 1, 1, 1, 0);
1771
2272
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (29, 1, false, '2007-08-09 21:54:18.553132', '2007-08-09 23:49:59', '2007-08-09 23:59:59', NULL, NULL, 1, NULL, 1);
2302
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (29, 1, false, '2007-08-09 21:54:18.553132', '2007-08-09 23:49:59', '2007-08-09 23:59:59', NULL, NULL, 1, NULL, 1, 0);
1772
2273
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type) VALUES (30, 3, false, '2007-08-10 00:00:01', '2007-08-10 00:00:01', '2007-08-10 00:00:14', NULL, 1, 1, 1, 1);
2303
INSERT INTO buildfarmjob (id, processor, virtualized, date_created, date_started, date_finished, date_first_dispatched, builder, status, log, job_type, failure_count) VALUES (30, 3, false, '2007-08-10 00:00:01', '2007-08-10 00:00:01', '2007-08-10 00:00:14', NULL, 1, 1, 1, 1, 0);
1773
2274
2304
1774
2275
2305
1775
2276
ALTER TABLE buildfarmjob ENABLE TRIGGER ALL;
2306
ALTER TABLE buildfarmjob ENABLE TRIGGER ALL;
1776
@@ -2365,29 +2395,29 @@
1777
2365
2395
1778
2366
ALTER TABLE sourcepackagerelease DISABLE TRIGGER ALL;
2396
ALTER TABLE sourcepackagerelease DISABLE TRIGGER ALL;
1779
2367
2397
1785
2368
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (14, 1, '0.9', '2004-09-27 11:57:13', 1, NULL, 1, 'Mozilla dummy Changelog......', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1), pmount', 'bacula-common (= 1.34.6-2), bacula-director-common (= 1.34.6-2), postgresql-client (>= 7.4), pmount', 'any', NULL, 1, 1, 1, 1, 1, 'Mark Shuttleworth <mark@canonical.com>', '3.6.2', '1.0', 'mozilla-firefox', 1, NULL, 'gcc-4.0, pmount', 'gcc-4.0-base, pmount', NULL, NULL, NULL);
2398
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (14, 1, '0.9', '2004-09-27 11:57:13', 1, NULL, 1, 'Mozilla dummy Changelog......', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1), pmount', 'bacula-common (= 1.34.6-2), bacula-director-common (= 1.34.6-2), postgresql-client (>= 7.4), pmount', 'any', NULL, 1, 1, 1, 1, 1, 'Mark Shuttleworth <mark@canonical.com>', '3.6.2', '1.0', 'mozilla-firefox', 1, NULL, 'gcc-4.0, pmount', 'gcc-4.0-base, pmount', NULL, NULL, NULL, NULL);
1786
2369
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2399
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (15, 1, '1.0', '2004-09-27 11:57:13', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 2, 1, 9, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1787
2370
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2400
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (16, 1, '1.0-1', '2005-03-10 16:30:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 3, 1, 10, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1788
2371
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2401
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (17, 1, '0.99.6-1', '2005-03-14 18:00:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 2, 1, 10, 1, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1789
2372
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (20, 1, '0.1-1', '2005-03-24 20:59:31.439579', 1, NULL, 1, 'pmount (0.1-1) hoary; urgency=low
2402
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (20, 1, '0.1-1', '2005-03-24 20:59:31.439579', 1, NULL, 1, 'pmount (0.1-1) hoary; urgency=low
1790
2373
2403
1791
2374
 * Fix description (Malone #1)
2404
 * Fix description (Malone #1)
1792
2375
 * Fix debian (Debian #2000)
2405
 * Fix debian (Debian #2000)
1793
2376
 * Fix warty (Warty Ubuntu #1)
2406
 * Fix warty (Warty Ubuntu #1)
1794
2377
2407
1808
2378
 -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2408
 -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 2, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1809
2379
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2409
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (21, 1, '0.1-2', '2005-06-24 20:59:31.439579', 1, NULL, 1, 'This is a placeholder changelog for pmount 0.1-2', NULL, NULL, 'powerpc', NULL, 1, 1, 14, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1810
2380
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (23, 1, '1.0.8-1ubuntu1', '2005-02-03 08:50:00', 1, NULL, 1, 'alsa-utils (1.0.8-1ubuntu1) warty; urgency=low
2410
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (23, 1, '1.0.8-1ubuntu1', '2005-02-03 08:50:00', 1, NULL, 1, 'alsa-utils (1.0.8-1ubuntu1) warty; urgency=low
1811
2381
2411
1812
2382
 * Placeholder
2412
 * Placeholder
1813
2383
2413
1814
2384
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 1, 19, 1, 1, 'Mark Shuttleworth <mark@example.com>', '3.6.2', '1.0', 'alsa-mixer', 1, NULL, NULL, NULL, NULL, NULL, NULL);
2414
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 1, 19, 1, 1, 'Mark Shuttleworth <mark@example.com>', '3.6.2', '1.0', 'alsa-mixer', 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1815
2385
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (24, 1, '1.0.9a-4', '2005-07-01 22:47:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4) warty; urgency=low
2415
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (24, 1, '1.0.9a-4', '2005-07-01 22:47:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4) warty; urgency=low
1816
2386
2416
1817
2387
 * Placeholder
2417
 * Placeholder
1818
2388
2418
1819
2389
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2419
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'any', NULL, 2, 1, 19, 8, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1820
2390
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (25, 1, '1.0.9a-4ubuntu1', '2005-08-01 14:10:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4ubuntu1) hoary; urgency=low
2420
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (25, 1, '1.0.9a-4ubuntu1', '2005-08-01 14:10:00', 1, NULL, 1, 'alsa-utils (1.0.9a-4ubuntu1) hoary; urgency=low
1821
2391
2421
1822
2392
 * Placeholder
2422
 * Placeholder
1823
2393
 LP: #10
2423
 LP: #10
1824
@@ -2396,22 +2426,22 @@
1825
2396
 LP: #7, #8,
2426
 LP: #7, #8,
1826
2397
   #11
2427
   #11
1827
2398
2428
1831
2399
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2429
     -- Sample Person <test@canonical.com> Tue, 7 Feb 2006 12:10:08 +0300', NULL, NULL, 'all', NULL, 1, 16, 19, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1832
2400
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2430
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (26, 1, 'cr.g7-37', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 20, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1833
2401
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (27, 1, 'b8p', '2006-02-10 11:19:00', 1, NULL, 1, 'libstdc++ (9.9-1) hoary; urgency=high
2431
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (27, 1, 'b8p', '2006-02-10 11:19:00', 1, NULL, 1, 'libstdc++ (9.9-1) hoary; urgency=high
1834
2402
2432
1835
2403
 * Placeholder
2433
 * Placeholder
1836
2404
2434
1847
2405
 -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2435
 -- Sample Person <test@canonical.com> Tue, 10 Feb 2006 10:10:08 +0300', NULL, NULL, 'powerpc i386', NULL, 1, 16, 21, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1848
2406
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2436
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (28, 1, '2.6.15.3', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 22, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1849
2407
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2437
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (29, 1, '0.00', '2005-12-22 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 17, 3, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1850
2408
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2438
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (30, 1, '1.0', '2006-09-28 18:19:00', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1851
2409
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2439
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (31, 1, '1.0', '2006-09-28 18:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 20, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1852
2410
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2440
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (32, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 23, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1853
2411
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2441
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (33, 1, '1.0', '2006-12-01 13:19:01', 1, NULL, 1, NULL, NULL, NULL, 'all', NULL, 1, 16, 24, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1854
2412
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL);
2442
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (34, 1, '1.0', '2007-02-15 14:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 29, 16, 25, 10, 1, NULL, NULL, '1.0', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1855
2413
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 10, NULL, NULL, NULL, NULL, NULL, NULL);
2443
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (35, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'any', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1856
2414
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (36, 243606, '1.0-1', '2007-08-09 21:25:37.832976', 1, NULL, 5, 'commercialpackage (1.0-1) breezy; urgency=low
2444
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (36, 243606, '1.0-1', '2007-08-09 21:25:37.832976', 1, NULL, 5, 'commercialpackage (1.0-1) breezy; urgency=low
1857
2415
2445
1858
2416
  * Initial version
2446
  * Initial version
1859
2417
      Address for testing linkification: Foo Bar <foo.bar@canonical.com>
2447
      Address for testing linkification: Foo Bar <foo.bar@canonical.com>
1860
@@ -2435,8 +2465,8 @@
1861
2435
iD8DBQFGtzTjWhGlTF8G/HcRAtFsAJ4hHyKhOnsUOQDI+SAk000DmFAnUgCcC84J
2465
iD8DBQFGtzTjWhGlTF8G/HcRAtFsAJ4hHyKhOnsUOQDI+SAk000DmFAnUgCcC84J
1862
2436
3F4bEPeRcnUjCFI/hjR0kxg=
2466
3F4bEPeRcnUjCFI/hjR0kxg=
1863
2437
=Tjln
2467
=Tjln
1866
2438
', 7, 243606, 27, 10, 1, 'Julian Edwards <launchpad@julian-edwards.com>', '3.6.2', '1.0', 'commercialpackage', 12, NULL, NULL, NULL, NULL, NULL, NULL);
2468
', 7, 243606, 27, 10, 1, 'Julian Edwards <launchpad@julian-edwards.com>', '3.6.2', '1.0', 'commercialpackage', 12, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1867
2439
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 11, NULL, NULL, NULL, NULL, NULL, NULL);
2469
INSERT INTO sourcepackagerelease (id, creator, version, dateuploaded, urgency, dscsigningkey, component, changelog_entry, builddepends, builddependsindep, architecturehintlist, dsc, section, maintainer, sourcepackagename, upload_distroseries, format, dsc_maintainer_rfc822, dsc_standards_version, dsc_format, dsc_binaries, upload_archive, copyright, build_conflicts, build_conflicts_indep, sourcepackage_recipe_build, changelog, user_defined_fields, homepage) VALUES (37, 1, '1.0', '2006-04-11 11:19:01', 1, NULL, 1, NULL, NULL, NULL, 'i386', NULL, 1, 16, 26, 1, 1, NULL, NULL, '1.0', NULL, 11, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1868
2440
2470
1869
2441
2471
1870
2442
ALTER TABLE sourcepackagerelease ENABLE TRIGGER ALL;
2472
ALTER TABLE sourcepackagerelease ENABLE TRIGGER ALL;
1871
@@ -2490,21 +2520,21 @@
1872
2490
2520
1873
2491
ALTER TABLE binarypackagerelease DISABLE TRIGGER ALL;
2521
ALTER TABLE binarypackagerelease DISABLE TRIGGER ALL;
1874
2492
2522
1890
2493
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (6, 6, '1.0', 'foobar is bad', 'foobar should be removed', 6, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2006-12-01 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2523
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (6, 6, '1.0', 'foobar is bad', 'foobar should be removed', 6, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2006-12-01 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1891
2494
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (12, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 2, 1, 1, 1, 10, NULL, 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'firefox-gnome-support (= 1.0.7-0ubuntu20), latex-xft-fonts, xprint', 'firefox, mozilla-web-browser', 'gnome-mozilla-browser', 'mozilla-firefox', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', 'pmount, foo', 'pmount, bar', 'pmount, baz', NULL, NULL);
2524
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (12, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 2, 1, 1, 1, 10, NULL, 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'firefox-gnome-support (= 1.0.7-0ubuntu20), latex-xft-fonts, xprint', 'firefox, mozilla-web-browser', 'gnome-mozilla-browser', 'mozilla-firefox', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', 'pmount, foo', 'pmount, bar', 'pmount, baz', NULL, NULL, NULL);
1892
2495
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (15, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 7, 1, 1, 1, 40, NULL, 'at (>= 3.14156), linux-2.6.12, tramp-package', NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2525
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (15, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 7, 1, 1, 1, 40, NULL, 'at (>= 3.14156), linux-2.6.12, tramp-package', NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1893
2496
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (16, 14, '2.6.12.20', 'the kernel of boom', 'this kernel is like the crystal method: a temple of boom', 14, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2526
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (16, 14, '2.6.12.20', 'the kernel of boom', 'this kernel is like the crystal method: a temple of boom', 14, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1894
2497
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (17, 15, '3.14156', 'at the mountains of madness', 'lovecraft long before enunciated that the mountains were not safe, but you did not believe him', 15, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2527
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (17, 15, '3.14156', 'at the mountains of madness', 'lovecraft long before enunciated that the mountains were not safe, but you did not believe him', 15, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1895
2498
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (18, 13, '2:1.9-1', 'pmount shortdesc', 'pmount description', 16, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2528
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (18, 13, '2:1.9-1', 'pmount shortdesc', 'pmount description', 16, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1896
2499
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (19, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 18, 1, 1, 1, 10, NULL, 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'firefox-gnome-support (= 1.0.7-0ubuntu20), latex-xft-fonts, xprint', 'firefox, mozilla-web-browser', 'gnome-mozilla-browser', 'mozilla-firefox', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL);
2529
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (19, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 18, 1, 1, 1, 10, NULL, 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'gcc-3.4-base, libc6 (>= 2.3.2.ds1-4), gcc-3.4 (>= 3.4.1-4sarge1), gcc-3.4 (<< 3.4.2), libstdc++6-dev (>= 3.4.1-4sarge1)', 'firefox-gnome-support (= 1.0.7-0ubuntu20), latex-xft-fonts, xprint', 'firefox, mozilla-web-browser', 'gnome-mozilla-browser', 'mozilla-firefox', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL, NULL);
1897
2500
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (20, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 19, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2530
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (20, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 19, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2005-10-19 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1898
2501
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (21, 16, '1.0', 'cdrkit is nice', 'cdrkit should be kept', 21, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2006-12-01 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2531
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (21, 16, '1.0', 'cdrkit is nice', 'cdrkit should be kept', 21, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2006-12-01 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1899
2502
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (22, 8, '1.0', 'ff from iceweasel', 'iceweasel huh ?', 23, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2006-04-11 12:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2532
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (22, 8, '1.0', 'ff from iceweasel', 'iceweasel huh ?', 23, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2006-04-11 12:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1900
2503
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (23, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 27, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2007-07-24 17:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2533
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (23, 13, '0.1-1', 'pmount shortdesc', 'pmount description', 27, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, false, NULL, '2007-07-24 17:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1901
2504
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (24, 8, '1.0', 'ff from iceweasel', 'iceweasel huh ?', 28, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2006-08-10 12:50:10.878712', NULL, NULL, NULL, NULL, NULL);
2534
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (24, 8, '1.0', 'ff from iceweasel', 'iceweasel huh ?', 28, 1, 1, 1, 40, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, true, NULL, '2006-08-10 12:50:10.878712', NULL, NULL, NULL, NULL, NULL, NULL);
1902
2505
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (25, 17, '1.0-1', 'Stuff for testing', ' This package is simply used for testing soyuz', 29, 1, 5, 7, 20, '', '', '', '', '', '', '', false, 8, true, NULL, '2007-08-09 21:54:18.456616', NULL, NULL, NULL, NULL, NULL);
2535
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (25, 17, '1.0-1', 'Stuff for testing', ' This package is simply used for testing soyuz', 29, 1, 5, 7, 20, '', '', '', '', '', '', '', false, 8, true, NULL, '2007-08-09 21:54:18.456616', NULL, NULL, NULL, NULL, NULL, NULL);
1903
2506
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (26, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 30, 1, 1, 1, 10, '', '', '', '', '', '', '', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL);
2536
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (26, 8, '0.9', 'Mozilla Firefox Web Browser', 'Mozilla Firefox Web Browser is .....', 30, 1, 1, 1, 10, '', '', '', '', '', '', '', false, NULL, true, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL, NULL);
1904
2507
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields) VALUES (27, 18, '0.9', 'Mozilla Firefox Data', 'Mozilla Firefox Data is .....', 2, 1, 1, 1, 10, '', '', '', '', '', '', '', false, NULL, false, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL);
2537
INSERT INTO binarypackagerelease (id, binarypackagename, version, summary, description, build, binpackageformat, component, section, priority, shlibdeps, depends, recommends, suggests, conflicts, replaces, provides, essential, installedsize, architecturespecific, fti, datecreated, pre_depends, enhances, breaks, debug_package, user_defined_fields, homepage) VALUES (27, 18, '0.9', 'Mozilla Firefox Data', 'Mozilla Firefox Data is .....', 2, 1, 1, 1, 10, '', '', '', '', '', '', '', false, NULL, false, NULL, '2005-10-19 17:50:10.874189', NULL, NULL, NULL, NULL, NULL, NULL);
1905
2508
2538
1906
2509
2539
1907
2510
ALTER TABLE binarypackagerelease ENABLE TRIGGER ALL;
2540
ALTER TABLE binarypackagerelease ENABLE TRIGGER ALL;
1908
@@ -3074,25 +3104,25 @@
1909
3074
3104
1910
3075
ALTER TABLE branchrevision DISABLE TRIGGER ALL;
3105
ALTER TABLE branchrevision DISABLE TRIGGER ALL;
1911
3076
3106
1931
3077
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (1, 1, 10, 1);
3107
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 10, 1);
1932
3078
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (2, 1, 11, 2);
3108
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 11, 2);
1933
3079
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (3, 1, 12, 3);
3109
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 12, 3);
1934
3080
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (4, 1, 20, 4);
3110
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 20, 4);
1935
3081
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (5, 2, 20, 5);
3111
INSERT INTO branchrevision (sequence, branch, revision) VALUES (1, 21, 4);
1936
3082
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (6, 3, 20, 6);
3112
INSERT INTO branchrevision (sequence, branch, revision) VALUES (2, 20, 5);
1937
3083
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (7, 4, 20, 7);
3113
INSERT INTO branchrevision (sequence, branch, revision) VALUES (2, 21, 5);
1938
3084
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (8, 5, 20, 8);
3114
INSERT INTO branchrevision (sequence, branch, revision) VALUES (3, 20, 6);
1939
3085
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (9, 6, 20, 9);
3115
INSERT INTO branchrevision (sequence, branch, revision) VALUES (3, 21, 10);
1940
3086
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (10, 1, 21, 4);
3116
INSERT INTO branchrevision (sequence, branch, revision) VALUES (4, 20, 7);
1941
3087
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (11, 2, 21, 5);
3117
INSERT INTO branchrevision (sequence, branch, revision) VALUES (4, 21, 11);
1942
3088
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (12, 3, 21, 10);
3118
INSERT INTO branchrevision (sequence, branch, revision) VALUES (5, 20, 8);
1943
3089
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (13, 4, 21, 11);
3119
INSERT INTO branchrevision (sequence, branch, revision) VALUES (5, 21, 8);
1944
3090
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (14, 5, 21, 8);
3120
INSERT INTO branchrevision (sequence, branch, revision) VALUES (6, 20, 9);
1945
3091
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (15, 6, 21, 9);
3121
INSERT INTO branchrevision (sequence, branch, revision) VALUES (6, 21, 9);
1946
3092
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (16, NULL, 20, 10);
3122
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 20, 10);
1947
3093
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (17, NULL, 20, 11);
3123
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 20, 11);
1948
3094
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (18, NULL, 21, 6);
3124
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 21, 6);
1949
3095
INSERT INTO branchrevision (id, sequence, branch, revision) VALUES (19, NULL, 21, 7);
3125
INSERT INTO branchrevision (sequence, branch, revision) VALUES (NULL, 21, 7);
1950
3096
3126
1951
3097
3127
1952
3098
ALTER TABLE branchrevision ENABLE TRIGGER ALL;
3128
ALTER TABLE branchrevision ENABLE TRIGGER ALL;
1953
@@ -3315,42 +3345,42 @@
1954
3315
3345
1955
3316
ALTER TABLE bugmessage DISABLE TRIGGER ALL;
3346
ALTER TABLE bugmessage DISABLE TRIGGER ALL;
1956
3317
3347
1993
3318
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (1, 2, 1, NULL, NULL, true);
3348
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (1, 2, 1, NULL, NULL, true, NULL);
1994
3319
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (2, 1, 3, NULL, NULL, true);
3349
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (2, 1, 3, NULL, NULL, true, NULL);
1995
3320
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (3, 1, 4, NULL, NULL, true);
3350
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (3, 1, 4, NULL, NULL, true, NULL);
1996
3321
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (4, 2, 5, NULL, NULL, true);
3351
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (4, 2, 5, NULL, NULL, true, NULL);
1997
3322
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (5, 2, 6, NULL, NULL, true);
3352
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (5, 2, 6, NULL, NULL, true, NULL);
1998
3323
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (6, 4, 7, NULL, NULL, true);
3353
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (6, 4, 7, NULL, NULL, true, NULL);
1999
3324
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (7, 5, 8, NULL, NULL, true);
3354
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (7, 5, 8, NULL, NULL, true, NULL);
2000
3325
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (8, 6, 9, NULL, NULL, true);
3355
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (8, 6, 9, NULL, NULL, true, NULL);
2001
3326
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (9, 3, 10, NULL, NULL, true);
3356
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (9, 3, 10, NULL, NULL, true, NULL);
2002
3327
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (10, 7, 11, NULL, NULL, true);
3357
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (10, 7, 11, NULL, NULL, true, NULL);
2003
3328
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (11, 8, 14, NULL, NULL, true);
3358
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (11, 8, 14, NULL, NULL, true, NULL);
2004
3329
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (12, 9, 15, NULL, NULL, true);
3359
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (12, 9, 15, NULL, NULL, true, NULL);
2005
3330
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (13, 10, 17, NULL, NULL, true);
3360
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (13, 10, 17, NULL, NULL, true, NULL);
2006
3331
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (14, 10, 16, NULL, NULL, true);
3361
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (14, 10, 16, NULL, NULL, true, NULL);
2007
3332
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (15, 11, 24, NULL, NULL, true);
3362
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (15, 11, 24, NULL, NULL, true, NULL);
2008
3333
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (16, 11, 25, NULL, NULL, true);
3363
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (16, 11, 25, NULL, NULL, true, NULL);
2009
3334
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (17, 11, 26, NULL, NULL, true);
3364
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (17, 11, 26, NULL, NULL, true, NULL);
2010
3335
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (18, 11, 27, NULL, NULL, true);
3365
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (18, 11, 27, NULL, NULL, true, NULL);
2011
3336
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (19, 11, 28, NULL, NULL, true);
3366
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (19, 11, 28, NULL, NULL, true, NULL);
2012
3337
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (20, 11, 29, NULL, NULL, true);
3367
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (20, 11, 29, NULL, NULL, true, NULL);
2013
3338
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (21, 11, 30, NULL, NULL, true);
3368
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (21, 11, 30, NULL, NULL, true, NULL);
2014
3339
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (22, 12, 31, NULL, NULL, true);
3369
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (22, 12, 31, NULL, NULL, true, NULL);
2015
3340
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (23, 12, 33, NULL, NULL, true);
3370
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (23, 12, 33, NULL, NULL, true, NULL);
2016
3341
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (24, 12, 34, NULL, NULL, true);
3371
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (24, 12, 34, NULL, NULL, true, NULL);
2017
3342
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (25, 12, 35, NULL, NULL, true);
3372
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (25, 12, 35, NULL, NULL, true, NULL);
2018
3343
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (26, 12, 36, NULL, NULL, true);
3373
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (26, 12, 36, NULL, NULL, true, NULL);
2019
3344
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (27, 13, 37, NULL, NULL, true);
3374
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (27, 13, 37, NULL, NULL, true, NULL);
2020
3345
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (28, 13, 38, NULL, NULL, true);
3375
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (28, 13, 38, NULL, NULL, true, NULL);
2021
3346
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (29, 14, 39, NULL, NULL, true);
3376
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (29, 14, 39, NULL, NULL, true, NULL);
2022
3347
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (30, 15, 40, NULL, NULL, true);
3377
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (30, 15, 40, NULL, NULL, true, NULL);
2023
3348
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true);
3378
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (31, 15, 44, 11, '<4284D7D1.6010208@gmx.de>', true, NULL);
2024
3349
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true);
3379
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (32, 15, 45, 11, '<20050517185429.GB20786@spring.luon.net>', true, NULL);
2025
3350
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true);
3380
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (33, 15, 46, 11, '<428A44E9.6090802@gmx.de>', true, NULL);
2026
3351
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true);
3381
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (34, 15, 47, 11, '<20050517202044.GA23231@spring.luon.net>', true, NULL);
2027
3352
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true);
3382
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (35, 15, 48, 11, '<20050617140011.GA15638@piware.de>', true, NULL);
2028
3353
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true);
3383
INSERT INTO bugmessage (id, bug, message, bugwatch, remote_comment_id, visible, index) VALUES (36, 15, 49, 11, '<42BD2E36.9090809@gmx.de>', true, NULL);
2029
3354
3384
2030
3355
3385
2031
3356
ALTER TABLE bugmessage ENABLE TRIGGER ALL;
3386
ALTER TABLE bugmessage ENABLE TRIGGER ALL;
2032
@@ -3674,6 +3704,45 @@
2033
3674
ALTER TABLE bugsubscription ENABLE TRIGGER ALL;
3704
ALTER TABLE bugsubscription ENABLE TRIGGER ALL;
2034
3675
3705
2035
3676
3706
2036
3707
ALTER TABLE structuralsubscription DISABLE TRIGGER ALL;
2037
3708
2038
3709
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (1, NULL, NULL, NULL, NULL, 1, NULL, 1, 16, 16, 40, 10, '2008-01-29 15:12:34.581468', '2008-01-29 15:12:34.581468');
2039
3710
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (2, NULL, NULL, NULL, NULL, 1, NULL, 14, 16, 16, 40, 10, '2008-01-29 15:12:34.581468', '2008-01-29 15:12:34.581468');
2040
3711
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (3, 22, NULL, NULL, NULL, NULL, NULL, NULL, 64, 64, 40, 10, '2008-02-06 12:17:13.030376', '2008-02-06 12:17:13.030376');
2041
3712
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (4, 16, NULL, NULL, NULL, NULL, NULL, NULL, 64, 64, 40, 10, '2008-02-06 12:17:13.030376', '2008-02-06 12:17:13.030376');
2042
3713
2043
3714
2044
3715
ALTER TABLE structuralsubscription ENABLE TRIGGER ALL;
2045
3716
2046
3717
2047
3718
ALTER TABLE bugsubscriptionfilter DISABLE TRIGGER ALL;
2048
3719
2049
3720
2050
3721
2051
3722
ALTER TABLE bugsubscriptionfilter ENABLE TRIGGER ALL;
2052
3723
2053
3724
2054
3725
ALTER TABLE bugsubscriptionfilterimportance DISABLE TRIGGER ALL;
2055
3726
2056
3727
2057
3728
2058
3729
ALTER TABLE bugsubscriptionfilterimportance ENABLE TRIGGER ALL;
2059
3730
2060
3731
2061
3732
ALTER TABLE bugsubscriptionfilterstatus DISABLE TRIGGER ALL;
2062
3733
2063
3734
2064
3735
2065
3736
ALTER TABLE bugsubscriptionfilterstatus ENABLE TRIGGER ALL;
2066
3737
2067
3738
2068
3739
ALTER TABLE bugsubscriptionfiltertag DISABLE TRIGGER ALL;
2069
3740
2070
3741
2071
3742
2072
3743
ALTER TABLE bugsubscriptionfiltertag ENABLE TRIGGER ALL;
2073
3744
2074
3745
2075
3677
ALTER TABLE bugtag DISABLE TRIGGER ALL;
3746
ALTER TABLE bugtag DISABLE TRIGGER ALL;
2076
3678
3747
2077
3679
INSERT INTO bugtag (id, bug, tag) VALUES (1, 9, 'crash');
3748
INSERT INTO bugtag (id, bug, tag) VALUES (1, 9, 'crash');
2078
@@ -3735,6 +3804,27 @@
2079
3735
ALTER TABLE bugtrackeralias ENABLE TRIGGER ALL;
3804
ALTER TABLE bugtrackeralias ENABLE TRIGGER ALL;
2080
3736
3805
2081
3737
3806
2082
3807
ALTER TABLE bugtrackercomponentgroup DISABLE TRIGGER ALL;
2083
3808
2084
3809
2085
3810
2086
3811
ALTER TABLE bugtrackercomponentgroup ENABLE TRIGGER ALL;
2087
3812
2088
3813
2089
3814
ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
2090
3815
2091
3816
2092
3817
2093
3818
ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
2094
3819
2095
3820
2096
3821
ALTER TABLE bugtrackercomponent DISABLE TRIGGER ALL;
2097
3822
2098
3823
2099
3824
2100
3825
ALTER TABLE bugtrackercomponent ENABLE TRIGGER ALL;
2101
3826
2102
3827
2103
3738
ALTER TABLE bugtrackerperson DISABLE TRIGGER ALL;
3828
ALTER TABLE bugtrackerperson DISABLE TRIGGER ALL;
2104
3739
3829
2105
3740
3830
2106
@@ -3936,6 +4026,13 @@
2107
3936
ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
4026
ALTER TABLE distributionbounty ENABLE TRIGGER ALL;
2108
3937
4027
2109
3938
4028
2110
4029
ALTER TABLE distributionjob DISABLE TRIGGER ALL;
2111
4030
2112
4031
2113
4032
2114
4033
ALTER TABLE distributionjob ENABLE TRIGGER ALL;
2115
4034
2116
4035
2117
3939
ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
4036
ALTER TABLE distributionmirror DISABLE TRIGGER ALL;
2118
3940
4037
2119
3941
INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
4038
INSERT INTO distributionmirror (id, distribution, name, http_base_url, ftp_base_url, rsync_base_url, displayname, description, owner, speed, country, content, official_candidate, enabled, date_created, whiteboard, status, date_reviewed, reviewer, country_dns_mirror) VALUES (1, 1, 'archive-mirror', 'http://localhost:11375/valid-mirror/', NULL, NULL, NULL, NULL, 1, 10, 75, 1, true, true, '2006-10-16 18:31:43.434567', NULL, 30, NULL, NULL, false);
2120
@@ -3953,13 +4050,6 @@
2121
3953
ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
4050
ALTER TABLE distributionmirror ENABLE TRIGGER ALL;
2122
3954
4051
2123
3955
4052
2124
3956
ALTER TABLE distributionsourcepackage DISABLE TRIGGER ALL;
2125
3957
2126
3958
2127
3959
2128
3960
ALTER TABLE distributionsourcepackage ENABLE TRIGGER ALL;
2129
3961
2130
3962
2131
3963
ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
4053
ALTER TABLE distributionsourcepackagecache DISABLE TRIGGER ALL;
2132
3964
4054
2133
3965
INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
4055
INSERT INTO distributionsourcepackagecache (id, distribution, sourcepackagename, name, binpkgnames, binpkgsummaries, binpkgdescriptions, fti, changelog, archive) VALUES (1, 3, 19, 'alsa-utils', '', '', '', NULL, NULL, 1);
2134
@@ -4000,6 +4090,27 @@
2135
4000
ALTER TABLE distrocomponentuploader ENABLE TRIGGER ALL;
4090
ALTER TABLE distrocomponentuploader ENABLE TRIGGER ALL;
2136
4001
4091
2137
4002
4092
2138
4093
ALTER TABLE packagediff DISABLE TRIGGER ALL;
2139
4094
2140
4095
2141
4096
2142
4097
ALTER TABLE packagediff ENABLE TRIGGER ALL;
2143
4098
2144
4099
2145
4100
ALTER TABLE distroseriesdifference DISABLE TRIGGER ALL;
2146
4101
2147
4102
2148
4103
2149
4104
ALTER TABLE distroseriesdifference ENABLE TRIGGER ALL;
2150
4105
2151
4106
2152
4107
ALTER TABLE distroseriesdifferencemessage DISABLE TRIGGER ALL;
2153
4108
2154
4109
2155
4110
2156
4111
ALTER TABLE distroseriesdifferencemessage ENABLE TRIGGER ALL;
2157
4112
2158
4113
2159
4003
ALTER TABLE distroserieslanguage DISABLE TRIGGER ALL;
4114
ALTER TABLE distroserieslanguage DISABLE TRIGGER ALL;
2160
4004
4115
2161
4005
INSERT INTO distroserieslanguage (id, distroseries, language, currentcount, updatescount, rosettacount, contributorcount, dateupdated, unreviewed_count) VALUES (1, 3, 68, 62, 0, 0, 1, '2007-01-15 17:58:40.839938', 0);
4116
INSERT INTO distroserieslanguage (id, distroseries, language, currentcount, updatescount, rosettacount, contributorcount, dateupdated, unreviewed_count) VALUES (1, 3, 68, 62, 0, 0, 1, '2007-01-15 17:58:40.839938', 0);
2162
@@ -4489,6 +4600,13 @@
2163
4489
ALTER TABLE hwtestanswerdevice ENABLE TRIGGER ALL;
4600
ALTER TABLE hwtestanswerdevice ENABLE TRIGGER ALL;
2164
4490
4601
2165
4491
4602
2166
4603
ALTER TABLE incrementaldiff DISABLE TRIGGER ALL;
2167
4604
2168
4605
2169
4606
2170
4607
ALTER TABLE incrementaldiff ENABLE TRIGGER ALL;
2171
4608
2172
4609
2173
4492
ALTER TABLE ircid DISABLE TRIGGER ALL;
4610
ALTER TABLE ircid DISABLE TRIGGER ALL;
2174
4493
4611
2175
4494
INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
4612
INSERT INTO ircid (id, person, network, nickname) VALUES (1, 1, 'irc.freenode.net', 'mark');
2176
@@ -5986,13 +6104,6 @@
2177
5986
ALTER TABLE packagecopyrequest ENABLE TRIGGER ALL;
6104
ALTER TABLE packagecopyrequest ENABLE TRIGGER ALL;
2178
5987
6105
2179
5988
6106
2180
5989
ALTER TABLE packagediff DISABLE TRIGGER ALL;
2181
5990
2182
5991
2183
5992
2184
5993
ALTER TABLE packagediff ENABLE TRIGGER ALL;
2185
5994
2186
5995
2187
5996
ALTER TABLE packageselection DISABLE TRIGGER ALL;
6107
ALTER TABLE packageselection DISABLE TRIGGER ALL;
2188
5997
6108
2189
5998
6109
2190
@@ -10462,17 +10573,6 @@
2191
10462
ALTER TABLE standardshipitrequest ENABLE TRIGGER ALL;
10573
ALTER TABLE standardshipitrequest ENABLE TRIGGER ALL;
2192
10463
10574
2193
10464
10575
2194
10465
ALTER TABLE structuralsubscription DISABLE TRIGGER ALL;
2195
10466
2196
10467
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (1, NULL, NULL, NULL, NULL, 1, NULL, 1, 16, 16, 40, 10, '2008-01-29 15:12:34.581468', '2008-01-29 15:12:34.581468');
2197
10468
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (2, NULL, NULL, NULL, NULL, 1, NULL, 14, 16, 16, 40, 10, '2008-01-29 15:12:34.581468', '2008-01-29 15:12:34.581468');
2198
10469
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (3, 22, NULL, NULL, NULL, NULL, NULL, NULL, 64, 64, 40, 10, '2008-02-06 12:17:13.030376', '2008-02-06 12:17:13.030376');
2199
10470
INSERT INTO structuralsubscription (id, product, productseries, project, milestone, distribution, distroseries, sourcepackagename, subscriber, subscribed_by, bug_notification_level, blueprint_notification_level, date_created, date_last_updated) VALUES (4, 16, NULL, NULL, NULL, NULL, NULL, NULL, 64, 64, 40, 10, '2008-02-06 12:17:13.030376', '2008-02-06 12:17:13.030376');
2200
10471
2201
10472
2202
10473
ALTER TABLE structuralsubscription ENABLE TRIGGER ALL;
2203
10474
2204
10475
2205
10476
ALTER TABLE suggestivepotemplate DISABLE TRIGGER ALL;
10576
ALTER TABLE suggestivepotemplate DISABLE TRIGGER ALL;
2206
10477
10577
2207
10478
10578
2208
@@ -11081,6 +11181,13 @@
2209
11081
ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;
11181
ALTER TABLE translationtemplateitem ENABLE TRIGGER ALL;
2210
11082
11182
2211
11083
11183
2212
11184
ALTER TABLE translationtemplatesbuild DISABLE TRIGGER ALL;
2213
11185
2214
11186
2215
11187
2216
11188
ALTER TABLE translationtemplatesbuild ENABLE TRIGGER ALL;
2217
11189
2218
11190
2219
11084
ALTER TABLE translator DISABLE TRIGGER ALL;
11191
ALTER TABLE translator DISABLE TRIGGER ALL;
2220
11085
11192
2221
11086
INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);
11193
INSERT INTO translator (id, translationgroup, language, translator, datecreated, style_guide_url) VALUES (1, 1, 387, 53, '2005-07-13 13:14:19.748396', NULL);
2222
11087
11194
2223
=== modified file 'database/schema/comments.sql'
2224
--- database/schema/comments.sql	2010-09-03 16:43:11 +0000
2225
+++ database/schema/comments.sql	2010-10-04 22:08:24 +0000
2226
@@ -346,6 +346,21 @@
2227
346
COMMENT ON COLUMN BugTrackerPerson.name IS 'The (within the bug tracker) unique username in the external bug tracker.';
346
COMMENT ON COLUMN BugTrackerPerson.name IS 'The (within the bug tracker) unique username in the external bug tracker.';
2228
347
COMMENT ON COLUMN BugTrackerPerson.person IS 'The Person record in Launchpad this user corresponds to.';
347
COMMENT ON COLUMN BugTrackerPerson.person IS 'The Person record in Launchpad this user corresponds to.';
2229
348
348
2230
349
-- BugTrackerComponent
2231
350
2232
351
COMMENT ON TABLE BugTrackerComponent IS 'A software component in a remote bug tracker, which can be linked to the corresponding source package in a distribution using this table.';
2233
352
COMMENT ON COLUMN BugTrackerComponent.name IS 'The name of the component as registered in the remote bug tracker.';
2234
353
COMMENT ON COLUMN BugTrackerComponent.is_visible IS 'Whether to display or hide the item in the Launchpad user interface.';
2235
354
COMMENT ON COLUMN BugTrackerComponent.is_custom IS 'Whether the item was added by a user in Launchpad or is kept in sync with the remote bug tracker.';
2236
355
COMMENT ON COLUMN BugTrackerComponent.component_group IS 'The product or other higher level category used by the remote bug tracker to group projects, if any.';
2237
356
COMMENT ON COLUMN BugTrackerComponent.distro_source_package IS 'A link to the source package in a distribution that corresponds to this component.  This can be undefined if no link has been established yet.';
2238
357
2239
358
-- BugTrackerComponentGroup
2240
359
2241
360
COMMENT ON TABLE BugTrackerComponentGroup IS 'A collection of components as modeled in a remote bug tracker, often referred to as a product.  Some bug trackers do not categorize software components this way, so they will have a single default component group that all components belong to.';
2242
361
COMMENT ON COLUMN BugTrackerComponentGroup.name IS 'The product or category name used in the remote bug tracker for grouping components.';
2243
362
COMMENT ON COLUMN BugTrackerComponentGroup.bug_tracker IS 'The external bug tracker this component group belongs to.';
2244
363
2245
349
-- BugCve
364
-- BugCve
2246
350
365
2247
351
COMMENT ON TABLE BugCve IS 'A table that records the link between a given malone bug number, and a CVE entry.';
366
COMMENT ON TABLE BugCve IS 'A table that records the link between a given malone bug number, and a CVE entry.';
2248
@@ -532,9 +547,12 @@
2249
532
COMMENT ON TABLE DistroSeriesDifference IS 'A difference of versions for a package in a derived distroseries and its parent distroseries.';
547
COMMENT ON TABLE DistroSeriesDifference IS 'A difference of versions for a package in a derived distroseries and its parent distroseries.';
2250
533
COMMENT ON COLUMN DistroSeriesDifference.derived_series IS 'The derived distroseries with the difference from its parent.';
548
COMMENT ON COLUMN DistroSeriesDifference.derived_series IS 'The derived distroseries with the difference from its parent.';
2251
534
COMMENT ON COLUMN DistroSeriesDifference.source_package_name IS 'The name of the source package which is different in the two series.';
549
COMMENT ON COLUMN DistroSeriesDifference.source_package_name IS 'The name of the source package which is different in the two series.';
2253
535
COMMENT ON COLUMN DistroSeriesDifference.package_diff IS 'The most recent package diff that was created for this difference.';
550
COMMENT ON COLUMN DistroSeriesDifference.package_diff IS 'The most recent package diff that was created for the base version to derived version.';
2254
551
COMMENT ON COLUMN DistroSeriesDifference.parent_package_diff IS 'The most recent package diff that was created for the base version to the parent version.';
2255
536
COMMENT ON COLUMN DistroSeriesDifference.status IS 'A distroseries difference can be needing attention, ignored or resolved.';
552
COMMENT ON COLUMN DistroSeriesDifference.status IS 'A distroseries difference can be needing attention, ignored or resolved.';
2256
537
COMMENT ON COLUMN DistroSeriesDifference.difference_type IS 'The type of difference that this record represents - a package unique to the derived series, or missing, or in both.';
553
COMMENT ON COLUMN DistroSeriesDifference.difference_type IS 'The type of difference that this record represents - a package unique to the derived series, or missing, or in both.';
2257
554
COMMENT ON COLUMN DistroSeriesDifference.source_version IS 'The version of the package in the derived series.';
2258
555
COMMENT ON COLUMN DistroSeriesDifference.parent_source_version IS 'The version of the package in the parent series.';
2259
538
556
2260
539
-- DistroSeriesDifferenceMessage
557
-- DistroSeriesDifferenceMessage
2261
540
COMMENT ON TABLE DistroSeriesDifferenceMessage IS 'A message/comment on a distro series difference.';
558
COMMENT ON TABLE DistroSeriesDifferenceMessage IS 'A message/comment on a distro series difference.';
2262
@@ -839,6 +857,11 @@
2263
839
COMMENT ON COLUMN TranslationRelicensingAgreement.allow_relicensing IS 'Does this person want their translations relicensed under BSD.';
857
COMMENT ON COLUMN TranslationRelicensingAgreement.allow_relicensing IS 'Does this person want their translations relicensed under BSD.';
2264
840
COMMENT ON COLUMN TranslationRelicensingAgreement.date_decided IS 'Date when the last change of opinion was registered.';
858
COMMENT ON COLUMN TranslationRelicensingAgreement.date_decided IS 'Date when the last change of opinion was registered.';
2265
841
859
2266
860
-- TranslationTemplatesBuild
2267
861
COMMENT ON TABLE TranslationTemplatesBuild IS 'Build-farm record of a translation templates build.';
2268
862
COMMENT ON COLUMN TranslationTemplatesBuild.build_farm_job IS 'Associated BuildFarmJob.';
2269
863
COMMENT ON COLUMN TranslationTemplatesBuild.branch IS 'Branch to build templates out of.';
2270
864
2271
842
-- RevisionAuthor
865
-- RevisionAuthor
2272
843
COMMENT ON TABLE RevisionAuthor IS 'All distinct authors for revisions.';
866
COMMENT ON TABLE RevisionAuthor IS 'All distinct authors for revisions.';
2273
844
COMMENT ON COLUMN RevisionAuthor.name IS 'The exact text extracted from the branch revision.';
867
COMMENT ON COLUMN RevisionAuthor.name IS 'The exact text extracted from the branch revision.';
2274
@@ -1171,6 +1194,7 @@
2275
1171
COMMENT ON COLUMN DistroArchSeries.package_count IS 'A cache of the number of binary packages published in this distro arch release. The count only includes packages published in the release pocket.';
1194
COMMENT ON COLUMN DistroArchSeries.package_count IS 'A cache of the number of binary packages published in this distro arch release. The count only includes packages published in the release pocket.';
2276
1172
COMMENT ON COLUMN DistroArchSeries.supports_virtualized IS 'Whether or not
1195
COMMENT ON COLUMN DistroArchSeries.supports_virtualized IS 'Whether or not
2277
1173
virtualized build support should be provided by this specific distroarchseries';
1196
virtualized build support should be provided by this specific distroarchseries';
2278
1197
COMMENT ON COLUMN DistroArchSeries.enabled IS 'Whether to allow build creation and publishing for this DistroArchSeries.';
2279
1174
1198
2280
1175
-- LauncpadDatabaseRevision
1199
-- LauncpadDatabaseRevision
2281
1176
COMMENT ON TABLE LaunchpadDatabaseRevision IS 'This table contains a list of the database patches that have been successfully applied to this database.';
1200
COMMENT ON TABLE LaunchpadDatabaseRevision IS 'This table contains a list of the database patches that have been successfully applied to this database.';
2282
@@ -1288,11 +1312,14 @@
2283
1288
1312
2284
1289
COMMENT ON TABLE ProjectBounty IS 'This table records a simple link between a bounty and a project. This bounty will be listed on the project web page, and the project will be mentioned on the bounty web page.';
1313
COMMENT ON TABLE ProjectBounty IS 'This table records a simple link between a bounty and a project. This bounty will be listed on the project web page, and the project will be mentioned on the bounty web page.';
2285
1290
1314
2287
1291
-- Messaging subsytem
1315
-- BugMessages
2288
1292
COMMENT ON TABLE BugMessage IS 'This table maps a message to a bug. In other words, it shows that a particular message is associated with a particular bug.';
1316
COMMENT ON TABLE BugMessage IS 'This table maps a message to a bug. In other words, it shows that a particular message is associated with a particular bug.';
2289
1293
COMMENT ON COLUMN BugMessage.bugwatch IS 'The external bug this bug comment was imported from.';
1317
COMMENT ON COLUMN BugMessage.bugwatch IS 'The external bug this bug comment was imported from.';
2290
1294
COMMENT ON COLUMN BugMessage.remote_comment_id IS 'The id this bug comment has in the external bug tracker, if it is an imported comment. If it is NULL while having a bugwatch set, this comment was added in Launchpad and needs to be pushed to the external bug tracker.';
1318
COMMENT ON COLUMN BugMessage.remote_comment_id IS 'The id this bug comment has in the external bug tracker, if it is an imported comment. If it is NULL while having a bugwatch set, this comment was added in Launchpad and needs to be pushed to the external bug tracker.';
2291
1295
COMMENT ON COLUMN BugMessage.visible IS 'If false, the bug comment is hidden and should not be shown in any UI.';
1319
COMMENT ON COLUMN BugMessage.visible IS 'If false, the bug comment is hidden and should not be shown in any UI.';
2292
1320
COMMENT ON COLUMN BugMessage.index IS 'The index (used in urls) of the message in a particular bug.';
2293
1321
2294
1322
-- Messaging subsytem
2295
1296
COMMENT ON TABLE Message IS 'This table stores a single RFC822-style message. Messages can be threaded (using the parent field). These messages can then be referenced from elsewhere in the system, such as the BugMessage table, integrating messageboard facilities with the rest of The Launchpad.';
1323
COMMENT ON TABLE Message IS 'This table stores a single RFC822-style message. Messages can be threaded (using the parent field). These messages can then be referenced from elsewhere in the system, such as the BugMessage table, integrating messageboard facilities with the rest of The Launchpad.';
2296
1297
COMMENT ON COLUMN Message.parent IS 'A "parent message". This allows for some level of threading in Messages.';
1324
COMMENT ON COLUMN Message.parent IS 'A "parent message". This allows for some level of threading in Messages.';
2297
1298
COMMENT ON COLUMN Message.subject IS 'The title text of the message, or the subject if it was an email.';
1325
COMMENT ON COLUMN Message.subject IS 'The title text of the message, or the subject if it was an email.';
2298
@@ -1932,6 +1959,14 @@
2299
1932
COMMENT ON COLUMN Continent.code IS 'A two-letter code for a continent.';
1959
COMMENT ON COLUMN Continent.code IS 'A two-letter code for a continent.';
2300
1933
COMMENT ON COLUMN Continent.name IS 'The name of the continent.';
1960
COMMENT ON COLUMN Continent.name IS 'The name of the continent.';
2301
1934
1961
2302
1962
-- DistributionJob
2303
1963
2304
1964
COMMENT ON TABLE DistributionJob IS 'Contains references to jobs to be run on distributions.';
2305
1965
COMMENT ON COLUMN DistributionJob.distribution IS 'The distribution to be acted on.';
2306
1966
COMMENT ON COLUMN DistributionJob.distroseries IS 'The distroseries to be acted on.';
2307
1967
COMMENT ON COLUMN DistributionJob.job_type IS 'The type of job';
2308
1968
COMMENT ON COLUMN DistributionJob.json_data IS 'A JSON struct containing data for the job.';
2309
1969
2310
1935
-- DistributionMirror
1970
-- DistributionMirror
2311
1936
COMMENT ON TABLE DistributionMirror IS 'A mirror of a given distribution.';
1971
COMMENT ON TABLE DistributionMirror IS 'A mirror of a given distribution.';
2312
1937
COMMENT ON COLUMN DistributionMirror.distribution IS 'The distribution to which the mirror refers to.';
1972
COMMENT ON COLUMN DistributionMirror.distribution IS 'The distribution to which the mirror refers to.';
2313
@@ -2303,6 +2338,14 @@
2314
2303
COMMENT ON COLUMN HWDMIValue.value IS 'The value';
2338
COMMENT ON COLUMN HWDMIValue.value IS 'The value';
2315
2304
COMMENT ON COLUMN HWDMIValue.handle IS 'The handle to which this key/value pair belongs.';
2339
COMMENT ON COLUMN HWDMIValue.handle IS 'The handle to which this key/value pair belongs.';
2316
2305
2340
2317
2341
-- IncrementalDiff
2318
2342
COMMENT ON TABLE IncrementalDiff IS 'Incremental diffs for merge proposals.';
2319
2343
COMMENT ON COLUMN IncrementalDiff.diff IS 'The contents of the diff.';
2320
2344
COMMENT ON COLUMN IncrementalDiff.branch_merge_proposal IS 'The merge proposal the diff is for.';
2321
2345
COMMENT ON COLUMN IncrementalDiff.old_revision IS 'The revision the diff is from.';
2322
2346
COMMENT ON COLUMN IncrementalDiff.new_revision IS 'The revision the diff is to.';
2323
2347
2324
2348
2325
2306
-- Job
2349
-- Job
2326
2307
2350
2327
2308
COMMENT ON TABLE Job IS 'Common info about a job.';
2351
COMMENT ON TABLE Job IS 'Common info about a job.';
2328
2309
2352
2329
=== modified file 'database/schema/launchpad_session.sql'
2330
--- database/schema/launchpad_session.sql	2010-09-06 09:48:41 +0000
2331
+++ database/schema/launchpad_session.sql	2010-10-04 22:08:24 +0000
2332
@@ -17,14 +17,13 @@
2333
17
CREATE TABLE TimeLimitedToken (
17
CREATE TABLE TimeLimitedToken (
2334
18
    path text NOT NULL,
18
    path text NOT NULL,
2335
19
    token text NOT NULL,
19
    token text NOT NULL,
2338
20
    created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
20
    created timestamp without time zone
2339
21
    constraint timelimitedtoken_pky primary key (path, token)
21
        NOT NULL DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC'),
2340
22
    constraint timelimitedtoken_pkey primary key (path, token)
2341
22
    ) WITHOUT OIDS;
23
    ) WITHOUT OIDS;
2342
23
COMMENT ON TABLE TimeLimitedToken IS 'stores tokens for granting access to a single path in the librarian for a short while. The garbo takes care of cleanups, and we should only have a few thousand at a time. Tokens are handed out just-in-time on the appserver, when a client attempts to dereference a private thing which we do not want to deliver in-line. OAuth tokens cannot be used for the launchpadlibrarian content because they would then be attackable. See lib.canonical.database.librarian for the python class.';
24
COMMENT ON TABLE TimeLimitedToken IS 'stores tokens for granting access to a single path in the librarian for a short while. The garbo takes care of cleanups, and we should only have a few thousand at a time. Tokens are handed out just-in-time on the appserver, when a client attempts to dereference a private thing which we do not want to deliver in-line. OAuth tokens cannot be used for the launchpadlibrarian content because they would then be attackable. See lib.canonical.database.librarian for the python class.';
2343
24
-- Give the garbo an efficient selection to cleanup
25
-- Give the garbo an efficient selection to cleanup
2344
25
CREATE INDEX timelimitedtoken_created ON TimeLimitedToken(created);
26
CREATE INDEX timelimitedtoken_created ON TimeLimitedToken(created);
2345
26
-- Give the librarian an efficient lookup
2346
27
CREATE INDEX timelimitedtoken_path_token ON TimeLimitedToken(path, token);
2347
28
27
2348
29
-- Let the session user access file access tokens.
28
-- Let the session user access file access tokens.
2349
30
GRANT SELECT, INSERT, UPDATE, DELETE ON TimeLimitedToken TO session;
29
GRANT SELECT, INSERT, UPDATE, DELETE ON TimeLimitedToken TO session;
2350
31
30
2351
=== added file 'database/schema/patch-2208-08-1.sql'
2352
--- database/schema/patch-2208-08-1.sql	1970-01-01 00:00:00 +0000
2353
+++ database/schema/patch-2208-08-1.sql	2010-10-04 22:08:24 +0000
2354
@@ -0,0 +1,9 @@
2355
1
-- Copyright 2010 Canonical Ltd.  This software is licensed under the
2356
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2357
3
2358
4
SET client_min_messages=ERROR;
2359
5
2360
6
ALTER TABLE distroarchseries
2361
7
    ADD COLUMN enabled bool NOT NULL DEFAULT TRUE;
2362
8
2363
9
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 08, 1);
2364
0
10
2365
=== added file 'database/schema/patch-2208-08-2.sql'
2366
--- database/schema/patch-2208-08-2.sql	1970-01-01 00:00:00 +0000
2367
+++ database/schema/patch-2208-08-2.sql	2010-10-04 22:08:24 +0000
2368
@@ -0,0 +1,8 @@
2369
1
SET client_min_messages=ERROR;
2370
2
2371
3
-- Permit bug searches ordered by 'importance' - the default - to serve from
2372
4
-- index rather than doing the full search and sorting.
2373
5
2374
6
CREATE INDEX bugtask_importance_idx ON BugTask (importance, id desc nulls first);
2375
7
2376
8
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 8, 2);
2377
0
9
2378
=== added file 'database/schema/patch-2208-08-3.sql'
2379
--- database/schema/patch-2208-08-3.sql	1970-01-01 00:00:00 +0000
2380
+++ database/schema/patch-2208-08-3.sql	2010-10-04 22:08:24 +0000
2381
@@ -0,0 +1,8 @@
2382
1
SET client_min_messages=ERROR;
2383
2
2384
3
-- Permit bug searches ordered by 'date_closed desc, id' to serve from
2385
4
-- index rather than doing the full search and sorting.
2386
5
2387
6
CREATE INDEX bugtask__date_closed__id__idx2 ON BugTask (date_closed, id desc nulls first);
2388
7
2389
8
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 8, 3);
2390
0
9
2391
=== added file 'database/schema/patch-2208-09-0.sql'
2392
--- database/schema/patch-2208-09-0.sql	1970-01-01 00:00:00 +0000
2393
+++ database/schema/patch-2208-09-0.sql	2010-10-04 22:08:24 +0000
2394
@@ -0,0 +1,38 @@
2395
1
-- Copyright 2010 Canonical Ltd.  This software is licensed under the
2396
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2397
3
2398
4
SET client_min_messages=ERROR;
2399
5
2400
6
CREATE TABLE BugTrackerComponentGroup (
2401
7
    id serial PRIMARY KEY,
2402
8
    name text NOT NULL,
2403
9
    bug_tracker integer NOT NULL REFERENCES BugTracker,
2404
10
2405
11
    CONSTRAINT valid_name CHECK (valid_name(name))
2406
12
);
2407
13
2408
14
ALTER TABLE BugTrackerComponentGroup
2409
15
    ADD CONSTRAINT bugtrackercomponentgroup__bug_tracker__name__key
2410
16
    UNIQUE (bug_tracker, name);
2411
17
2412
18
2413
19
CREATE TABLE BugTrackerComponent (
2414
20
    id serial PRIMARY KEY,
2415
21
    name text NOT NULL,
2416
22
    is_visible boolean NOT NULL DEFAULT True,
2417
23
    is_custom boolean NOT NULL DEFAULT True,
2418
24
    component_group integer NOT NULL REFERENCES BugTrackerComponentGroup,
2419
25
    distro_source_package integer REFERENCES DistributionSourcePackage,
2420
26
2421
27
    CONSTRAINT valid_name CHECK (valid_name(name))
2422
28
);
2423
29
2424
30
ALTER TABLE BugTrackerComponent
2425
31
    ADD CONSTRAINT bugtrackercomponent__component_group__name__key
2426
32
    UNIQUE (component_group, name);
2427
33
2428
34
ALTER TABLE BugTrackerComponent
2429
35
    ADD CONSTRAINT bugtrackercomponent__distro_source_package__key
2430
36
    UNIQUE (distro_source_package);
2431
37
2432
38
INSERT INTO LaunchpadDatabaseRevision VALUES(2208, 09, 0);
2433
0
39
2434
=== added file 'database/schema/patch-2208-10-0.sql'
2435
--- database/schema/patch-2208-10-0.sql	1970-01-01 00:00:00 +0000
2436
+++ database/schema/patch-2208-10-0.sql	2010-10-04 22:08:24 +0000
2437
@@ -0,0 +1,25 @@
2438
1
-- Copyright 2009 Canonical Ltd.  This software is licensed under the
2439
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2440
3
2441
4
SET client_min_messages=ERROR;
2442
5
2443
6
-- The `InitialiseDistroSeriesJob` table captures the data required for an ifp job.
2444
7
2445
8
CREATE TABLE DistributionJob (
2446
9
    id serial PRIMARY KEY,
2447
10
    -- FK to the `Job` record with the "generic" data about this archive
2448
11
    -- job.
2449
12
    job integer NOT NULL CONSTRAINT distributionjob__job__fk REFERENCES job,
2450
13
    -- FK to the associated `Distribution` record.
2451
14
    distribution integer NOT NULL REFERENCES Distribution,
2452
15
    distroseries integer REFERENCES DistroSeries,
2453
16
    -- The particular type of foo job
2454
17
    job_type integer NOT NULL,
2455
18
    -- JSON data for use by the job
2456
19
    json_data text
2457
20
);
2458
21
2459
22
ALTER TABLE DistributionJob ADD CONSTRAINT distributionjob__job__key UNIQUE (job);
2460
23
CREATE UNIQUE INDEX distribution_job__initialise_series__distroseries ON DistributionJob (distroseries) WHERE job_type = 1;
2461
24
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 10, 0);
2462
25
2463
0
26
2464
=== added file 'database/schema/patch-2208-11-0.sql'
2465
--- database/schema/patch-2208-11-0.sql	1970-01-01 00:00:00 +0000
2466
+++ database/schema/patch-2208-11-0.sql	2010-10-04 22:08:24 +0000
2467
@@ -0,0 +1,30 @@
2468
1
-- Copyright 2010 Canonical Ltd.  This software is licensed under the
2469
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2470
3
2471
4
SET client_min_messages=ERROR;
2472
5
2473
6
-- This constraint is useless given the current PK
2474
7
ALTER TABLE BranchRevision
2475
8
DROP CONSTRAINT revisionnumber_branch_id_unique;
2476
9
2477
10
-- This constraint is no longer needed as it will be the new PK
2478
11
ALTER TABLE BranchRevision
2479
12
DROP CONSTRAINT revision__branch__revision__key ;
2480
13
2481
14
-- Kill the old PK
2482
15
ALTER TABLE BranchRevision
2483
16
DROP CONSTRAINT revisionnumber_pkey ;
2484
17
2485
18
-- Create the new PK
2486
19
ALTER TABLE BranchRevision
2487
20
ADD CONSTRAINT revisionnumber_pkey PRIMARY KEY (branch, revision);
2488
21
2489
22
-- What was this used for?  Not used now.
2490
23
DROP VIEW RevisionNumber;
2491
24
2492
25
-- Kill the old id.
2493
26
ALTER TABLE BranchRevision
2494
27
DROP COLUMN id;
2495
28
2496
29
2497
30
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 11, 0);
2498
0
31
2499
=== added file 'database/schema/patch-2208-12-0.sql'
2500
--- database/schema/patch-2208-12-0.sql	1970-01-01 00:00:00 +0000
2501
+++ database/schema/patch-2208-12-0.sql	2010-10-04 22:08:24 +0000
2502
@@ -0,0 +1,17 @@
2503
1
SET client_min_messages=ERROR;
2504
2
2505
3
-- Allow for package diffs against both derived and parent versions.
2506
4
ALTER TABLE DistroSeriesDifference ADD COLUMN parent_package_diff integer CONSTRAINT distroseriesdifference__parent_package_diff__fk REFERENCES packagediff;
2507
5
CREATE INDEX distroseriesdifference__parent_package_diff__idx ON distroseriesdifference(parent_package_diff);
2508
6
2509
7
-- Add columns for source_version and parent_source_version
2510
8
ALTER TABLE DistroSeriesDifference ADD COLUMN source_version text;
2511
9
ALTER TABLE DistroSeriesDifference ADD CONSTRAINT valid_source_version CHECK(valid_debian_version(source_version));
2512
10
ALTER TABLE DistroSeriesDifference ADD COLUMN parent_source_version text;
2513
11
ALTER TABLE DistroSeriesDifference ADD CONSTRAINT valid_parent_source_version CHECK(valid_debian_version(parent_source_version));
2514
12
2515
13
-- Add a unique constraint/index for the source_package_name/derived series combo and drop the previous index.
2516
14
ALTER TABLE DistroSeriesDifference ADD CONSTRAINT distroseriesdifference__derived_series__source_package_name__key UNIQUE (derived_series, source_package_name);
2517
15
DROP INDEX distroseriesdifference__derived_series__idx;
2518
16
2519
17
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 12, 0);
2520
0
18
2521
=== added file 'database/schema/patch-2208-13-0.sql'
2522
--- database/schema/patch-2208-13-0.sql	1970-01-01 00:00:00 +0000
2523
+++ database/schema/patch-2208-13-0.sql	2010-10-04 22:08:24 +0000
2524
@@ -0,0 +1,17 @@
2525
1
-- Copyright 2010 Canonical Ltd.  This software is licensed under the
2526
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2527
3
2528
4
SET client_min_messages=ERROR;
2529
5
2530
6
CREATE TABLE TranslationTemplatesBuild (
2531
7
    id SERIAL PRIMARY KEY,
2532
8
    build_farm_job integer NOT NULL REFERENCES BuildFarmJob(id),
2533
9
    branch integer NOT NULL REFERENCES Branch(id));
2534
10
2535
11
CREATE INDEX translationtemplatesbuild__build_farm_job__idx ON
2536
12
    TranslationTemplatesBuild(build_farm_job);
2537
13
2538
14
CREATE INDEX translationtemplatesbuild__branch__idx ON
2539
15
    TranslationTemplatesBuild(branch);
2540
16
2541
17
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 13, 0);
2542
0
18
2543
=== added file 'database/schema/patch-2208-14-0.sql'
2544
--- database/schema/patch-2208-14-0.sql	1970-01-01 00:00:00 +0000
2545
+++ database/schema/patch-2208-14-0.sql	2010-10-04 22:08:24 +0000
2546
@@ -0,0 +1,9 @@
2547
1
SET client_min_messages=ERROR;
2548
2
2549
3
-- Store the row index of bug messages so we don't have to calculate it all the time.
2550
4
ALTER TABLE BugMessage ADD COLUMN index integer;
2551
5
2552
6
-- BugMessage.indexes must be unique per bug.
2553
7
ALTER TABLE BugMessage ADD CONSTRAINT bugmessage__bug__index__key UNIQUE (bug, index);
2554
8
2555
9
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 14, 0);
2556
0
10
2557
=== added file 'database/schema/patch-2208-15-0.sql'
2558
--- database/schema/patch-2208-15-0.sql	1970-01-01 00:00:00 +0000
2559
+++ database/schema/patch-2208-15-0.sql	2010-10-04 22:08:24 +0000
2560
@@ -0,0 +1,7 @@
2561
1
SET client_min_messages=ERROR;
2562
2
2563
3
-- Delete index obsoleted by bugtask__date_closed__id__idx2
2564
4
2565
5
DROP INDEX bugtask__date_closed__id__idx;
2566
6
2567
7
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 15, 0);
2568
0
8
2569
=== added file 'database/schema/patch-2208-16-0.sql'
2570
--- database/schema/patch-2208-16-0.sql	1970-01-01 00:00:00 +0000
2571
+++ database/schema/patch-2208-16-0.sql	2010-10-04 22:08:24 +0000
2572
@@ -0,0 +1,8 @@
2573
1
-- Copyright 2010 Canonical Ltd.  This software is licensed under the
2574
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2575
3
SET client_min_messages=ERROR;
2576
4
2577
5
ALTER TABLE SourcePackageRecipeBuildJob
2578
6
    ALTER COLUMN sourcepackage_recipe_build SET NOT NULL;
2579
7
2580
8
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 16, 0);
2581
0
9
2582
=== added file 'database/schema/patch-2208-17-0.sql'
2583
--- database/schema/patch-2208-17-0.sql	1970-01-01 00:00:00 +0000
2584
+++ database/schema/patch-2208-17-0.sql	2010-10-04 22:08:24 +0000
2585
@@ -0,0 +1,18 @@
2586
1
-- Copyright 2010 Canonical Ltd. This software is licensed under the
2587
2
-- GNU Affero General Public License version 3 (see the file LICENSE).
2588
3
2589
4
SET client_min_messages=ERROR;
2590
5
2591
6
CREATE TABLE IncrementalDiff(
2592
7
    id serial PRIMARY KEY,
2593
8
    diff integer NOT NULL CONSTRAINT diff_fk REFERENCES Diff ON DELETE CASCADE,
2594
9
    branch_merge_proposal integer NOT NULL CONSTRAINT branch_merge_proposal_fk REFERENCES BranchMergeProposal ON DELETE CASCADE,
2595
10
    old_revision integer NOT NULL CONSTRAINT old_revision_fk REFERENCES Revision ON DELETE CASCADE,
2596
11
    new_revision integer NOT NULL CONSTRAINT new_revision_fk REFERENCES Revision ON DELETE CASCADE);
2597
12
2598
13
CREATE INDEX incrementaldiff__diff__idx ON IncrementalDiff(diff);
2599
14
CREATE INDEX incrementaldiff__branch_merge_proposal__idx ON IncrementalDiff(branch_merge_proposal);
2600
15
CREATE INDEX incrementaldiff__old_revision__idx ON IncrementalDiff(old_revision);
2601
16
CREATE INDEX incrementaldiff__new_revision__idx ON IncrementalDiff(new_revision);
2602
17
2603
18
INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 17, 0);
2604
0
19
2605
=== modified file 'database/schema/security.cfg'
2606
--- database/schema/security.cfg	2010-09-21 23:09:59 +0000
2607
+++ database/schema/security.cfg	2010-10-04 22:08:24 +0000
2608
@@ -121,6 +121,8 @@
2609
121
public.bugnotificationrecipientarchive  = SELECT, UPDATE
121
public.bugnotificationrecipientarchive  = SELECT, UPDATE
2610
122
public.bugtag                           = SELECT, INSERT, DELETE
122
public.bugtag                           = SELECT, INSERT, DELETE
2611
123
public.bugtrackerperson                 = SELECT, UPDATE
123
public.bugtrackerperson                 = SELECT, UPDATE
2612
124
public.bugtrackercomponent              = SELECT, INSERT, UPDATE
2613
125
public.bugtrackercomponentgroup         = SELECT, INSERT, UPDATE
2614
124
public.bugwatchactivity                 = SELECT, INSERT, UPDATE
126
public.bugwatchactivity                 = SELECT, INSERT, UPDATE
2615
125
public.codeimport                       = SELECT, INSERT, UPDATE, DELETE
127
public.codeimport                       = SELECT, INSERT, UPDATE, DELETE
2616
126
public.codeimportevent                  = SELECT, INSERT, UPDATE
128
public.codeimportevent                  = SELECT, INSERT, UPDATE
2617
@@ -138,6 +140,7 @@
2618
138
public.databasereplicationlag           = SELECT
140
public.databasereplicationlag           = SELECT
2619
139
public.diff                             = SELECT, INSERT, UPDATE
141
public.diff                             = SELECT, INSERT, UPDATE
2620
140
public.distributionbounty               = SELECT, INSERT, UPDATE
142
public.distributionbounty               = SELECT, INSERT, UPDATE
2621
143
public.distributionjob                  = SELECT, INSERT
2622
141
public.distributionmirror               = SELECT, INSERT, UPDATE, DELETE
144
public.distributionmirror               = SELECT, INSERT, UPDATE, DELETE
2623
142
public.distributionsourcepackage        = SELECT, INSERT, UPDATE, DELETE
145
public.distributionsourcepackage        = SELECT, INSERT, UPDATE, DELETE
2624
143
public.distributionsourcepackagecache   = SELECT
146
public.distributionsourcepackagecache   = SELECT
2625
@@ -169,6 +172,7 @@
2626
169
public.hwtest                           = SELECT
172
public.hwtest                           = SELECT
2627
170
public.hwvendorid                       = SELECT
173
public.hwvendorid                       = SELECT
2628
171
public.hwvendorname                     = SELECT
174
public.hwvendorname                     = SELECT
2629
175
public.incrementaldiff                  = SELECT, INSERT, UPDATE, DELETE
2630
172
public.job                              = SELECT, INSERT, UPDATE, DELETE
176
public.job                              = SELECT, INSERT, UPDATE, DELETE
2631
173
public.karmacache                       = SELECT
177
public.karmacache                       = SELECT
2632
174
public.karmacategory                    = SELECT
178
public.karmacategory                    = SELECT
2633
@@ -237,7 +241,6 @@
2634
237
public.revision                         = SELECT, INSERT, UPDATE
241
public.revision                         = SELECT, INSERT, UPDATE
2635
238
public.revisionauthor                   = SELECT, INSERT, UPDATE
242
public.revisionauthor                   = SELECT, INSERT, UPDATE
2636
239
public.revisioncache                    = SELECT, INSERT, UPDATE, DELETE
243
public.revisioncache                    = SELECT, INSERT, UPDATE, DELETE
2637
240
public.revisionnumber                   = SELECT, INSERT
2638
241
public.revisionparent                   = SELECT, INSERT
244
public.revisionparent                   = SELECT, INSERT
2639
242
public.scriptactivity                   = SELECT
245
public.scriptactivity                   = SELECT
2640
243
public.shipitreport                     = SELECT, INSERT
246
public.shipitreport                     = SELECT, INSERT
2641
@@ -276,6 +279,7 @@
2642
276
public.translationgroup                 = SELECT, INSERT, UPDATE
279
public.translationgroup                 = SELECT, INSERT, UPDATE
2643
277
public.translationimportqueueentry      = SELECT, INSERT, UPDATE, DELETE
280
public.translationimportqueueentry      = SELECT, INSERT, UPDATE, DELETE
2644
278
public.translationmessage               = SELECT, INSERT, UPDATE
281
public.translationmessage               = SELECT, INSERT, UPDATE
2645
282
public.translationtemplatesbuild        = SELECT, INSERT, UPDATE, DELETE
2646
279
public.translator                       = SELECT, INSERT, UPDATE, DELETE
283
public.translator                       = SELECT, INSERT, UPDATE, DELETE
2647
280
public.usertouseremail                  = SELECT, UPDATE
284
public.usertouseremail                  = SELECT, UPDATE
2648
281
public.validpersoncache                 = SELECT
285
public.validpersoncache                 = SELECT
2649
@@ -538,8 +542,14 @@
2650
538
public.bugnotification                  = SELECT, INSERT
542
public.bugnotification                  = SELECT, INSERT
2651
539
public.bugnotificationrecipient         = SELECT, INSERT
543
public.bugnotificationrecipient         = SELECT, INSERT
2652
540
public.bugsubscription                  = SELECT
544
public.bugsubscription                  = SELECT
2653
545
public.bugsubscriptionfilter            = SELECT
2654
546
public.bugsubscriptionfilterstatus      = SELECT
2655
547
public.bugsubscriptionfilterimportance  = SELECT
2656
548
public.bugsubscriptionfiltertag         = SELECT
2657
541
public.bugtask                          = SELECT, INSERT, UPDATE
549
public.bugtask                          = SELECT, INSERT, UPDATE
2658
542
public.bugtracker                       = SELECT, INSERT
550
public.bugtracker                       = SELECT, INSERT
2659
551
public.bugtrackercomponent              = SELECT, INSERT, UPDATE, DELETE
2660
552
public.bugtrackercomponentgroup         = SELECT, INSERT, UPDATE, DELETE
2661
543
public.bugtrackeralias                  = SELECT
553
public.bugtrackeralias                  = SELECT
2662
544
public.bugtrackerperson                 = SELECT, INSERT
554
public.bugtrackerperson                 = SELECT, INSERT
2663
545
public.bugwatch                         = SELECT, INSERT, UPDATE
555
public.bugwatch                         = SELECT, INSERT, UPDATE
2664
@@ -595,7 +605,9 @@
2665
595
public.distribution                     = SELECT
605
public.distribution                     = SELECT
2666
596
public.distributionsourcepackage        = SELECT, UPDATE
606
public.distributionsourcepackage        = SELECT, UPDATE
2667
597
public.emailaddress                     = SELECT
607
public.emailaddress                     = SELECT
2668
608
public.incrementaldiff                  = SELECT
2669
598
public.job                              = SELECT, INSERT, UPDATE, DELETE
609
public.job                              = SELECT, INSERT, UPDATE, DELETE
2670
610
public.translationtemplatesbuild        = SELECT, INSERT
2671
599
# Karma
611
# Karma
2672
600
public.karma                            = SELECT, INSERT
612
public.karma                            = SELECT, INSERT
2673
601
public.karmaaction                      = SELECT
613
public.karmaaction                      = SELECT
2674
@@ -617,6 +629,10 @@
2675
617
public.bugactivity                      = SELECT, INSERT
629
public.bugactivity                      = SELECT, INSERT
2676
618
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
630
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
2677
619
public.bugsubscription                  = SELECT
631
public.bugsubscription                  = SELECT
2678
632
public.bugsubscriptionfilter            = SELECT
2679
633
public.bugsubscriptionfilterstatus      = SELECT
2680
634
public.bugsubscriptionfilterimportance  = SELECT
2681
635
public.bugsubscriptionfiltertag         = SELECT
2682
620
public.bugnotification                  = SELECT, INSERT
636
public.bugnotification                  = SELECT, INSERT
2683
621
public.bugnotificationrecipient         = SELECT, INSERT
637
public.bugnotificationrecipient         = SELECT, INSERT
2684
622
public.structuralsubscription           = SELECT
638
public.structuralsubscription           = SELECT
2685
@@ -805,6 +821,10 @@
2686
805
public.bugactivity                      = SELECT, INSERT
821
public.bugactivity                      = SELECT, INSERT
2687
806
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
822
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
2688
807
public.bugsubscription                  = SELECT
823
public.bugsubscription                  = SELECT
2689
824
public.bugsubscriptionfilter            = SELECT
2690
825
public.bugsubscriptionfilterstatus      = SELECT
2691
826
public.bugsubscriptionfilterimportance  = SELECT
2692
827
public.bugsubscriptionfiltertag         = SELECT
2693
808
public.bugnotification                  = SELECT, INSERT
828
public.bugnotification                  = SELECT, INSERT
2694
809
public.bugnotificationrecipient         = SELECT, INSERT
829
public.bugnotificationrecipient         = SELECT, INSERT
2695
810
public.bugnomination                    = SELECT
830
public.bugnomination                    = SELECT
2696
@@ -889,6 +909,7 @@
2697
889
public.flatpackagesetinclusion                  = SELECT
909
public.flatpackagesetinclusion                  = SELECT
2698
890
public.teamparticipation                        = SELECT
910
public.teamparticipation                        = SELECT
2699
891
public.translationimportqueueentry              = SELECT, INSERT, UPDATE
911
public.translationimportqueueentry              = SELECT, INSERT, UPDATE
2700
912
public.translationtemplatesbuild                = SELECT, INSERT
2701
892
913
2702
893
[ppa-apache-log-parser]
914
[ppa-apache-log-parser]
2703
894
type=user
915
type=user
2704
@@ -929,6 +950,10 @@
2705
929
public.bugpackageinfestation            = SELECT, INSERT, UPDATE
950
public.bugpackageinfestation            = SELECT, INSERT, UPDATE
2706
930
public.bugproductinfestation            = SELECT, INSERT, UPDATE
951
public.bugproductinfestation            = SELECT, INSERT, UPDATE
2707
931
public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
952
public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
2708
953
public.bugsubscriptionfilter            = SELECT, INSERT, UPDATE, DELETE
2709
954
public.bugsubscriptionfilterstatus      = SELECT, INSERT, UPDATE, DELETE
2710
955
public.bugsubscriptionfilterimportance  = SELECT, INSERT, UPDATE, DELETE
2711
956
public.bugsubscriptionfiltertag         = SELECT, INSERT, UPDATE, DELETE
2712
932
public.bugtask                          = SELECT, INSERT, UPDATE, DELETE
957
public.bugtask                          = SELECT, INSERT, UPDATE, DELETE
2713
933
public.bugtracker                       = SELECT, INSERT, UPDATE, DELETE
958
public.bugtracker                       = SELECT, INSERT, UPDATE, DELETE
2714
934
public.bugtrackeralias                  = SELECT, INSERT, UPDATE, DELETE
959
public.bugtrackeralias                  = SELECT, INSERT, UPDATE, DELETE
2715
@@ -1157,6 +1182,10 @@
2716
1157
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
1182
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
2717
1158
public.bugjob                           = SELECT, INSERT
1183
public.bugjob                           = SELECT, INSERT
2718
1159
public.bugsubscription                  = SELECT
1184
public.bugsubscription                  = SELECT
2719
1185
public.bugsubscriptionfilter            = SELECT
2720
1186
public.bugsubscriptionfilterstatus      = SELECT
2721
1187
public.bugsubscriptionfilterimportance  = SELECT
2722
1188
public.bugsubscriptionfiltertag         = SELECT
2723
1160
public.bugnotification                  = SELECT, INSERT
1189
public.bugnotification                  = SELECT, INSERT
2724
1161
public.bugnotificationrecipient         = SELECT, INSERT
1190
public.bugnotificationrecipient         = SELECT, INSERT
2725
1162
public.bugnomination                    = SELECT
1191
public.bugnomination                    = SELECT
2726
@@ -1259,6 +1288,10 @@
2727
1259
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
1288
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
2728
1260
public.bugjob                           = SELECT, INSERT
1289
public.bugjob                           = SELECT, INSERT
2729
1261
public.bugsubscription                  = SELECT
1290
public.bugsubscription                  = SELECT
2730
1291
public.bugsubscriptionfilter            = SELECT
2731
1292
public.bugsubscriptionfilterstatus      = SELECT
2732
1293
public.bugsubscriptionfilterimportance  = SELECT
2733
1294
public.bugsubscriptionfiltertag         = SELECT
2734
1262
public.bugnotification                  = SELECT, INSERT
1295
public.bugnotification                  = SELECT, INSERT
2735
1263
public.bugnotificationrecipient         = SELECT, INSERT
1296
public.bugnotificationrecipient         = SELECT, INSERT
2736
1264
public.bugnomination                    = SELECT
1297
public.bugnomination                    = SELECT
2737
@@ -1326,6 +1359,10 @@
2738
1326
public.bugnotification                  = SELECT, INSERT, UPDATE
1359
public.bugnotification                  = SELECT, INSERT, UPDATE
2739
1327
public.bugnotificationrecipient         = SELECT, INSERT, UPDATE
1360
public.bugnotificationrecipient         = SELECT, INSERT, UPDATE
2740
1328
public.bugsubscription                  = SELECT, INSERT
1361
public.bugsubscription                  = SELECT, INSERT
2741
1362
public.bugsubscriptionfilter            = SELECT, INSERT
2742
1363
public.bugsubscriptionfilterstatus      = SELECT, INSERT
2743
1364
public.bugsubscriptionfilterimportance  = SELECT, INSERT
2744
1365
public.bugsubscriptionfiltertag         = SELECT, INSERT
2745
1329
public.bugnomination                    = SELECT
1366
public.bugnomination                    = SELECT
2746
1330
public.bug                              = SELECT, INSERT, UPDATE
1367
public.bug                              = SELECT, INSERT, UPDATE
2747
1331
public.bugactivity                      = SELECT, INSERT
1368
public.bugactivity                      = SELECT, INSERT
2748
@@ -1440,6 +1477,7 @@
2749
1440
[translationsbranchscanner]
1477
[translationsbranchscanner]
2750
1441
type=user
1478
type=user
2751
1442
groups=branchscanner,translations_approval
1479
groups=branchscanner,translations_approval
2752
1480
public.translationtemplatesbuild        = SELECT, INSERT
2753
1443
1481
2754
1444
[translationstobranch]
1482
[translationstobranch]
2755
1445
type=user
1483
type=user
2756
@@ -1545,6 +1583,10 @@
2757
1545
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
1583
public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
2758
1546
public.bugjob                           = SELECT, INSERT
1584
public.bugjob                           = SELECT, INSERT
2759
1547
public.bugsubscription                  = SELECT, INSERT
1585
public.bugsubscription                  = SELECT, INSERT
2760
1586
public.bugsubscriptionfilter            = SELECT, INSERT
2761
1587
public.bugsubscriptionfilterstatus      = SELECT, INSERT
2762
1588
public.bugsubscriptionfilterimportance  = SELECT, INSERT
2763
1589
public.bugsubscriptionfiltertag         = SELECT, INSERT
2764
1548
public.bugnotification                  = SELECT, INSERT
1590
public.bugnotification                  = SELECT, INSERT
2765
1549
public.bugnotificationattachment        = SELECT
1591
public.bugnotificationattachment        = SELECT
2766
1550
public.bugnotificationrecipient         = SELECT, INSERT
1592
public.bugnotificationrecipient         = SELECT, INSERT
2767
@@ -1553,6 +1595,10 @@
2768
1553
public.bugtask                          = SELECT, INSERT, UPDATE
1595
public.bugtask                          = SELECT, INSERT, UPDATE
2769
1554
public.bugmessage                       = SELECT, INSERT
1596
public.bugmessage                       = SELECT, INSERT
2770
1555
public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
1597
public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
2771
1598
public.bugsubscriptionfilter            = SELECT, INSERT, UPDATE, DELETE
2772
1599
public.bugsubscriptionfilterstatus      = SELECT, INSERT, UPDATE, DELETE
2773
1600
public.bugsubscriptionfilterimportance  = SELECT, INSERT, UPDATE, DELETE
2774
1601
public.bugsubscriptionfiltertag         = SELECT, INSERT, UPDATE, DELETE
2775
1556
public.bugtracker                       = SELECT, INSERT
1602
public.bugtracker                       = SELECT, INSERT
2776
1557
public.bugtrackeralias                  = SELECT, INSERT
1603
public.bugtrackeralias                  = SELECT, INSERT
2777
1558
public.bugwatch                         = SELECT, INSERT
1604
public.bugwatch                         = SELECT, INSERT
2778
@@ -1719,6 +1765,7 @@
2779
1719
public.distribution                     = SELECT
1765
public.distribution                     = SELECT
2780
1720
public.distroseries                     = SELECT
1766
public.distroseries                     = SELECT
2781
1721
public.emailaddress                     = SELECT
1767
public.emailaddress                     = SELECT
2782
1768
public.incrementaldiff                  = SELECT, INSERT
2783
1722
public.job                              = SELECT, INSERT, UPDATE
1769
public.job                              = SELECT, INSERT, UPDATE
2784
1723
public.karmaaction                      = SELECT
1770
public.karmaaction                      = SELECT
2785
1724
public.karma                            = SELECT, INSERT
1771
public.karma                            = SELECT, INSERT
2786
@@ -1731,6 +1778,7 @@
2787
1731
public.previewdiff                      = SELECT, INSERT
1778
public.previewdiff                      = SELECT, INSERT
2788
1732
public.product                          = SELECT
1779
public.product                          = SELECT
2789
1733
public.productseries                    = SELECT
1780
public.productseries                    = SELECT
2790
1781
public.revision                         = SELECT
2791
1734
public.seriessourcepackagebranch        = SELECT
1782
public.seriessourcepackagebranch        = SELECT
2792
1735
public.sourcepackagename                = SELECT
1783
public.sourcepackagename                = SELECT
2793
1736
public.staticdiff                       = SELECT, INSERT
1784
public.staticdiff                       = SELECT, INSERT
2794
@@ -1812,6 +1860,10 @@
2795
1812
public.message                          = SELECT, INSERT
1860
public.message                          = SELECT, INSERT
2796
1813
public.messagechunk                     = SELECT, INSERT
1861
public.messagechunk                     = SELECT, INSERT
2797
1814
public.bugsubscription                  = SELECT, INSERT
1862
public.bugsubscription                  = SELECT, INSERT
2798
1863
public.bugsubscriptionfilter            = SELECT, INSERT
2799
1864
public.bugsubscriptionfilterstatus      = SELECT, INSERT
2800
1865
public.bugsubscriptionfilterimportance  = SELECT, INSERT
2801
1866
public.bugsubscriptionfiltertag         = SELECT, INSERT
2802
1815
public.bugmessage                       = SELECT, INSERT
1867
public.bugmessage                       = SELECT, INSERT
2803
1816
public.sourcepackagename                = SELECT
1868
public.sourcepackagename                = SELECT
2804
1817
public.job                              = SELECT, INSERT, UPDATE
1869
public.job                              = SELECT, INSERT, UPDATE
2805
@@ -1839,6 +1891,10 @@
2806
1839
public.bug                              = SELECT, UPDATE
1891
public.bug                              = SELECT, UPDATE
2807
1840
public.bugattachment                    = SELECT, DELETE
1892
public.bugattachment                    = SELECT, DELETE
2808
1841
public.bugsubscription                  = SELECT
1893
public.bugsubscription                  = SELECT
2809
1894
public.bugsubscriptionfilter            = SELECT
2810
1895
public.bugsubscriptionfilterstatus      = SELECT
2811
1896
public.bugsubscriptionfilterimportance  = SELECT
2812
1897
public.bugsubscriptionfiltertag         = SELECT
2813
1842
public.bugaffectsperson                 = SELECT
1898
public.bugaffectsperson                 = SELECT
2814
1843
public.bugnotification                  = SELECT, DELETE
1899
public.bugnotification                  = SELECT, DELETE
2815
1844
public.bugnotificationrecipientarchive  = SELECT
1900
public.bugnotificationrecipientarchive  = SELECT
2816
1845
1901
2817
=== modified file 'lib/canonical/config/schema-lazr.conf'
2818
--- lib/canonical/config/schema-lazr.conf	2010-09-24 14:24:06 +0000
2819
+++ lib/canonical/config/schema-lazr.conf	2010-10-04 22:08:24 +0000
2820
@@ -301,6 +301,18 @@
2821
301
# datatype: string
301
# datatype: string
2822
302
logfile: -
302
logfile: -
2823
303
303
2824
304
# The location of the log file used by the LaunchpadForkingService
2825
305
# datatype: string
2826
306
forker_logfile: -
2827
307
2828
308
# Should we be using the forking daemon? Or should we be calling spawnProcess
2829
309
# instead?
2830
310
# datatype: boolean
2831
311
use_forking_daemon: False
2832
312
# What disk path will the daemon listen on
2833
313
# datatype: string
2834
314
forking_daemon_socket: /var/tmp/launchpad_forking_service.sock
2835
315
2836
304
# The prefix of the web URL for all public branches. This should end with a
316
# The prefix of the web URL for all public branches. This should end with a
2837
305
# slash.
317
# slash.
2838
306
#
318
#
2839
@@ -644,6 +656,11 @@
2840
644
# datatype: integer
656
# datatype: integer
2841
645
storm_cache_size: 500
657
storm_cache_size: 500
2842
646
658
2843
659
# Where database/replication/slon_ctl.py dumps its logs. Used for the
2844
660
# staging replication environment.
2845
661
# datatype: existing_directory
2846
662
replication_logdir: database/replication
2847
663
2848
647
664
2849
648
[diff]
665
[diff]
2850
649
# The maximum size in bytes to read from the librarian to make available in
666
# The maximum size in bytes to read from the librarian to make available in
2851
650
667
2852
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
2853
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-09-10 17:32:29 +0000
2854
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-10-04 22:08:24 +0000
2855
@@ -2419,7 +2419,7 @@
2856
2419
    background-repeat: no-repeat;
2419
    background-repeat: no-repeat;
2857
2420
    background-position:right center;
2420
    background-position:right center;
2858
2421
    }
2421
    }
2860
2422
table#packages_list tr.superseded {
2422
table#packages_list tr.superseded, tr.blacklisted {
2861
2423
    background-color: #eee;
2423
    background-color: #eee;
2862
2424
    }
2424
    }
2863
2425
ul.latest-ppa-updates li:nth-child(odd) {
2425
ul.latest-ppa-updates li:nth-child(odd) {
2864
2426
2426
2865
=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
2866
--- lib/canonical/launchpad/interfaces/__init__.py	2010-09-30 17:08:50 +0000
2867
+++ lib/canonical/launchpad/interfaces/__init__.py	2010-10-04 22:08:24 +0000
2868
@@ -55,6 +55,8 @@
2869
55
from lp.registry.interfaces.distribution import *
55
from lp.registry.interfaces.distribution import *
2870
56
from lp.registry.interfaces.distributionmirror import *
56
from lp.registry.interfaces.distributionmirror import *
2871
57
from lp.registry.interfaces.distributionsourcepackage import *
57
from lp.registry.interfaces.distributionsourcepackage import *
2872
58
from lp.registry.interfaces.distroseriesdifference import *
2873
59
from lp.registry.interfaces.distroseriesdifferencecomment import *
2874
58
from lp.soyuz.interfaces.distributionsourcepackagecache import *
60
from lp.soyuz.interfaces.distributionsourcepackagecache import *
2875
59
from lp.soyuz.interfaces.distributionsourcepackagerelease import *
61
from lp.soyuz.interfaces.distributionsourcepackagerelease import *
2876
60
from lp.registry.interfaces.series import *
62
from lp.registry.interfaces.series import *
2877
61
63
2878
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
2879
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-08-27 11:19:54 +0000
2880
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-10-04 22:08:24 +0000
2881
@@ -77,6 +77,9 @@
2882
77
    IDistributionSourcePackage,
77
    IDistributionSourcePackage,
2883
78
    )
78
    )
2884
79
from lp.registry.interfaces.distroseries import IDistroSeries
79
from lp.registry.interfaces.distroseries import IDistroSeries
2885
80
from lp.registry.interfaces.distroseriesdifferencecomment import (
2886
81
    IDistroSeriesDifferenceComment,
2887
82
    )
2888
80
from lp.registry.interfaces.person import (
83
from lp.registry.interfaces.person import (
2889
81
    IPerson,
84
    IPerson,
2890
82
    IPersonPublic,
85
    IPersonPublic,
2891
@@ -89,6 +92,7 @@
2892
89
    IStructuralSubscription,
92
    IStructuralSubscription,
2893
90
    IStructuralSubscriptionTarget,
93
    IStructuralSubscriptionTarget,
2894
91
    )
94
    )
2895
95
from lp.services.comments.interfaces.conversation import IComment
2896
92
from lp.soyuz.enums import (
96
from lp.soyuz.enums import (
2897
93
    PackagePublishingStatus,
97
    PackagePublishingStatus,
2898
94
    PackageUploadCustomFormat,
98
    PackageUploadCustomFormat,
2899
@@ -321,6 +325,9 @@
2900
321
IBuildFarmJob['status'].vocabulary = BuildStatus
325
IBuildFarmJob['status'].vocabulary = BuildStatus
2901
322
IBuildFarmJob['buildqueue_record'].schema = IBuildQueue
326
IBuildFarmJob['buildqueue_record'].schema = IBuildQueue
2902
323
327
2903
328
# IComment
2904
329
IComment['comment_author'].schema = IPerson
2905
330
2906
324
# IDistribution
331
# IDistribution
2907
325
IDistribution['series'].value_type.schema = IDistroSeries
332
IDistribution['series'].value_type.schema = IDistroSeries
2908
326
patch_reference_property(
333
patch_reference_property(
2909
@@ -366,6 +373,9 @@
2910
366
    IDistroSeries, 'getPackageUploads', IPackageUpload)
373
    IDistroSeries, 'getPackageUploads', IPackageUpload)
2911
367
patch_reference_property(IDistroSeries, 'parent_series', IDistroSeries)
374
patch_reference_property(IDistroSeries, 'parent_series', IDistroSeries)
2912
368
375
2913
376
# IDistroSeriesDifferenceComment
2914
377
IDistroSeriesDifferenceComment['comment_author'].schema = IPerson
2915
378
2916
369
# IDistroArchSeries
379
# IDistroArchSeries
2917
370
patch_reference_property(IDistroArchSeries, 'main_archive', IArchive)
380
patch_reference_property(IDistroArchSeries, 'main_archive', IArchive)
2918
371
381
2919
372
382
2920
=== modified file 'lib/canonical/launchpad/scripts/runlaunchpad.py'
2921
--- lib/canonical/launchpad/scripts/runlaunchpad.py	2010-09-17 20:46:58 +0000
2922
+++ lib/canonical/launchpad/scripts/runlaunchpad.py	2010-10-04 22:08:24 +0000
2923
@@ -184,6 +184,53 @@
2924
184
        stop_at_exit(process)
184
        stop_at_exit(process)
2925
185
185
2926
186
186
2927
187
class ForkingSessionService(Service):
2928
188
    """A lp-forking-service for handling ssh access."""
2929
189
2930
190
    # TODO: The SFTP (and bzr+ssh) server depends fairly heavily on this
2931
191
    #       service. It would seem reasonable to make one always start if the
2932
192
    #       other one is started. Though this might be a way to "FeatureFlag"
2933
193
    #       whether this is active or not.
2934
194
2935
195
    @property
2936
196
    def should_launch(self):
2937
197
        return (config.codehosting.launch and
2938
198
                config.codehosting.use_forking_daemon)
2939
199
2940
200
    @property
2941
201
    def logfile(self):
2942
202
        """Return the log file to use.
2943
203
2944
204
        Default to the value of the configuration key logfile.
2945
205
        """
2946
206
        return config.codehosting.forker_logfile
2947
207
2948
208
    def launch(self):
2949
209
        # Following the logic in TacFile. Specifically, if you configure sftp
2950
210
        # to not run (and thus bzr+ssh) then we don't want to run the forking
2951
211
        # service.
2952
212
        if not self.should_launch:
2953
213
            return
2954
214
        from lp.codehosting import get_bzr_path
2955
215
        command = [config.root + '/bin/py', get_bzr_path(),
2956
216
                   'launchpad-forking-service',
2957
217
                   '--path', config.codehosting.forking_daemon_socket,
2958
218
                  ]
2959
219
        env = dict(os.environ)
2960
220
        env['BZR_PLUGIN_PATH'] = config.root + '/bzrplugins'
2961
221
        logfile = self.logfile
2962
222
        if logfile == '-':
2963
223
            # This process uses a different logging infrastructure from the
2964
224
            # rest of the Launchpad code. As such, it cannot trivially use '-'
2965
225
            # as the logfile. So we just ignore this setting.
2966
226
            pass
2967
227
        else:
2968
228
            env['BZR_LOG'] = logfile
2969
229
        process = subprocess.Popen(command, env=env, stdin=subprocess.PIPE)
2970
230
        process.stdin.close()
2971
231
        stop_at_exit(process)
2972
232
2973
233
2974
187
def stop_at_exit(process):
234
def stop_at_exit(process):
2975
188
    """Create and register an atexit hook for killing a process.
235
    """Create and register an atexit hook for killing a process.
2976
189
236
2977
@@ -208,6 +255,9 @@
2978
208
    'librarian': TacFile('librarian', 'daemons/librarian.tac',
255
    'librarian': TacFile('librarian', 'daemons/librarian.tac',
2979
209
                         'librarian_server', prepare_for_librarian),
256
                         'librarian_server', prepare_for_librarian),
2980
210
    'sftp': TacFile('sftp', 'daemons/sftp.tac', 'codehosting'),
257
    'sftp': TacFile('sftp', 'daemons/sftp.tac', 'codehosting'),
2981
258
    # TODO, we probably need to run the forking service whenever somebody
2982
259
    #       requests the sftp service...
2983
260
    'forker': ForkingSessionService(),
2984
211
    'mailman': MailmanService(),
261
    'mailman': MailmanService(),
2985
212
    'codebrowse': CodebrowseService(),
262
    'codebrowse': CodebrowseService(),
2986
213
    'google-webservice': GoogleWebService(),
263
    'google-webservice': GoogleWebService(),
2987
214
264
2988
=== modified file 'lib/canonical/launchpad/webapp/interfaces.py'
2989
--- lib/canonical/launchpad/webapp/interfaces.py	2010-09-12 11:43:36 +0000
2990
+++ lib/canonical/launchpad/webapp/interfaces.py	2010-10-04 22:08:24 +0000
2991
@@ -335,6 +335,10 @@
2992
335
    query_string_params = Attribute(
335
    query_string_params = Attribute(
2993
336
        'A dictionary of the query string parameters.')
336
        'A dictionary of the query string parameters.')
2994
337
337
2995
338
    is_ajax = Bool(
2996
339
        title=_('Is ajax'), required=False, readonly=True,
2997
340
        description=_("Indicates whether the request is an XMLHttpRequest."))
2998
341
2999
338
    def getRootURL(rootsite):
342
    def getRootURL(rootsite):
3000
339
        """Return this request's root URL.
343
        """Return this request's root URL.
3001
340
344
3002
341
345
3003
=== modified file 'lib/canonical/launchpad/webapp/servers.py'
3004
--- lib/canonical/launchpad/webapp/servers.py	2010-09-22 15:17:39 +0000
3005
+++ lib/canonical/launchpad/webapp/servers.py	2010-10-04 22:08:24 +0000
3006
@@ -526,7 +526,27 @@
3007
526
    return decoded_qs
526
    return decoded_qs
3008
527
527
3009
528
528
3011
529
class BasicLaunchpadRequest:
529
class LaunchpadBrowserRequestMixin:
3012
530
    """Provides methods used for both API and web browser requests."""
3013
531
3014
532
    def getRootURL(self, rootsite):
3015
533
        """See IBasicLaunchpadRequest."""
3016
534
        if rootsite is not None:
3017
535
            assert rootsite in allvhosts.configs, (
3018
536
                "rootsite is %s.  Must be in %r." % (
3019
537
                    rootsite, sorted(allvhosts.configs.keys())))
3020
538
            root_url = allvhosts.configs[rootsite].rooturl
3021
539
        else:
3022
540
            root_url = self.getApplicationURL() + '/'
3023
541
        return root_url
3024
542
3025
543
    @property
3026
544
    def is_ajax(self):
3027
545
        """See `IBasicLaunchpadRequest`."""
3028
546
        return 'XMLHttpRequest' == self.getHeader('HTTP_X_REQUESTED_WITH')
3029
547
3030
548
3031
549
class BasicLaunchpadRequest(LaunchpadBrowserRequestMixin):
3032
530
    """Mixin request class to provide stepstogo."""
550
    """Mixin request class to provide stepstogo."""
3033
531
551
3034
532
    implements(IBasicLaunchpadRequest)
552
    implements(IBasicLaunchpadRequest)
3035
@@ -581,24 +601,8 @@
3036
581
        return get_query_string_params(self)
601
        return get_query_string_params(self)
3037
582
602
3038
583
603
3039
584
class LaunchpadBrowserRequestMixin:
3040
585
    """A mixin for classes that share some method implementations."""
3041
586
3042
587
    def getRootURL(self, rootsite):
3043
588
        """See IBasicLaunchpadRequest."""
3044
589
        if rootsite is not None:
3045
590
            assert rootsite in allvhosts.configs, (
3046
591
                "rootsite is %s.  Must be in %r." % (
3047
592
                    rootsite, sorted(allvhosts.configs.keys())))
3048
593
            root_url = allvhosts.configs[rootsite].rooturl
3049
594
        else:
3050
595
            root_url = self.getApplicationURL() + '/'
3051
596
        return root_url
3052
597
3053
598
3054
599
class LaunchpadBrowserRequest(BasicLaunchpadRequest, BrowserRequest,
604
class LaunchpadBrowserRequest(BasicLaunchpadRequest, BrowserRequest,
3057
600
                              NotificationRequest, ErrorReportRequest,
605
                              NotificationRequest, ErrorReportRequest):
3056
601
                              LaunchpadBrowserRequestMixin):
3058
602
    """Integration of launchpad mixin request classes to make an uber
606
    """Integration of launchpad mixin request classes to make an uber
3059
603
    launchpad request class.
607
    launchpad request class.
3060
604
    """
608
    """
3061
@@ -1370,7 +1374,7 @@
3062
1370
1374
3063
1371
1375
3064
1372
class PublicXMLRPCRequest(BasicLaunchpadRequest, XMLRPCRequest,
1376
class PublicXMLRPCRequest(BasicLaunchpadRequest, XMLRPCRequest,
3066
1373
                          ErrorReportRequest, LaunchpadBrowserRequestMixin):
1377
                          ErrorReportRequest):
3067
1374
    """Request type for doing public XML-RPC in Launchpad."""
1378
    """Request type for doing public XML-RPC in Launchpad."""
3068
1375
1379
3069
1376
    def _createResponse(self):
1380
    def _createResponse(self):
3070
1377
1381
3071
=== modified file 'lib/canonical/launchpad/webapp/tests/test_servers.py'
3072
--- lib/canonical/launchpad/webapp/tests/test_servers.py	2010-08-20 20:31:18 +0000
3073
+++ lib/canonical/launchpad/webapp/tests/test_servers.py	2010-10-04 22:08:24 +0000
3074
@@ -358,6 +358,20 @@
3075
358
            retried_request.response.getHeader('Vary'),
358
            retried_request.response.getHeader('Vary'),
3076
359
            'Cookie, Authorization')
359
            'Cookie, Authorization')
3077
360
360
3078
361
    def test_is_ajax_false(self):
3079
362
        """Normal requests do not define HTTP_X_REQUESTED_WITH."""
3080
363
        request = LaunchpadBrowserRequest(StringIO.StringIO(''), {})
3081
364
3082
365
        self.assertFalse(request.is_ajax)
3083
366
3084
367
    def test_is_ajax_true(self):
3085
368
        """Requests with HTTP_X_REQUESTED_WITH set are ajax requests."""
3086
369
        request = LaunchpadBrowserRequest(StringIO.StringIO(''), {
3087
370
            'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest',
3088
371
            })
3089
372
3090
373
        self.assertTrue(request.is_ajax)
3091
374
3092
361
375
3093
362
class IThingSet(Interface):
376
class IThingSet(Interface):
3094
363
    """Marker interface for a set of things."""
377
    """Marker interface for a set of things."""
3095
364
378
3096
=== modified file 'lib/canonical/launchpad/zcml/librarian.zcml'
3097
--- lib/canonical/launchpad/zcml/librarian.zcml	2010-09-30 02:52:07 +0000
3098
+++ lib/canonical/launchpad/zcml/librarian.zcml	2010-10-04 22:08:24 +0000
3099
@@ -16,7 +16,7 @@
3100
16
    <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasWithParent" />
16
    <allow interface="canonical.launchpad.interfaces.librarian.ILibraryFileAliasWithParent" />
3101
17
    <require
17
    <require
3102
18
      permission="launchpad.Edit"
18
      permission="launchpad.Edit"
3104
19
      set_attributes="restricted" />
19
      set_attributes="mimetype restricted" />
3105
20
  </class>
20
  </class>
3106
21
21
3107
22
  <class class="canonical.launchpad.database.librarian.LibraryFileContent">
22
  <class class="canonical.launchpad.database.librarian.LibraryFileContent">
3108
23
23
3109
=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
3110
--- lib/lp/app/templates/base-layout-macros.pt	2010-09-29 03:26:01 +0000
3111
+++ lib/lp/app/templates/base-layout-macros.pt	2010-10-04 22:08:24 +0000
3112
@@ -181,6 +181,8 @@
3113
181
    <script type="text/javascript"
181
    <script type="text/javascript"
3114
182
            tal:attributes="src string:${lp_js}/bugs/bugtracker_overlay.js"></script>
182
            tal:attributes="src string:${lp_js}/bugs/bugtracker_overlay.js"></script>
3115
183
    <script type="text/javascript"
183
    <script type="text/javascript"
3116
184
            tal:attributes="src string:${lp_js}/registry/distroseriesdifferences_details.js"></script>
3117
185
    <script type="text/javascript"
3118
184
            tal:attributes="src string:${lp_js}/registry/milestoneoverlay.js"></script>
186
            tal:attributes="src string:${lp_js}/registry/milestoneoverlay.js"></script>
3119
185
    <script type="text/javascript"
187
    <script type="text/javascript"
3120
186
            tal:attributes="src string:${lp_js}/registry/milestonetable.js"></script>
188
            tal:attributes="src string:${lp_js}/registry/milestonetable.js"></script>
3121
187
189
3122
=== modified file 'lib/lp/bugs/browser/bugattachment.py'
3123
--- lib/lp/bugs/browser/bugattachment.py	2010-09-06 07:44:21 +0000
3124
+++ lib/lp/bugs/browser/bugattachment.py	2010-10-04 22:08:24 +0000
3125
@@ -12,19 +12,21 @@
3126
12
    'BugAttachmentURL',
12
    'BugAttachmentURL',
3127
13
    ]
13
    ]
3128
14
14
3132
15
from cStringIO import StringIO
15
from zope.component import (
3133
16
16
    getMultiAdapter,
3134
17
from zope.component import getUtility
17
    getUtility,
3135
18
    )
3136
18
from zope.contenttype import guess_content_type
19
from zope.contenttype import guess_content_type
3137
19
from zope.interface import implements
20
from zope.interface import implements
3138
20
21
3139
21
from canonical.launchpad.browser.librarian import (
22
from canonical.launchpad.browser.librarian import (
3140
22
    FileNavigationMixin,
23
    FileNavigationMixin,
3141
23
    ProxiedLibraryFileAlias,
24
    ProxiedLibraryFileAlias,
3142
24
    StreamOrRedirectLibraryFileAliasView,
3143
25
    SafeStreamOrRedirectLibraryFileAliasView,
25
    SafeStreamOrRedirectLibraryFileAliasView,
3144
26
    )
26
    )
3146
27
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
27
from canonical.launchpad.interfaces.librarian import (
3147
28
    ILibraryFileAliasWithParent,
3148
29
    )
3149
28
from canonical.launchpad.webapp import (
30
from canonical.launchpad.webapp import (
3150
29
    canonical_url,
31
    canonical_url,
3151
30
    custom_widget,
32
    custom_widget,
3152
@@ -163,7 +165,10 @@
3153
163
            self.context.title = data['title']
165
            self.context.title = data['title']
3154
164
166
3155
165
        if self.context.libraryfile.mimetype != data['contenttype']:
167
        if self.context.libraryfile.mimetype != data['contenttype']:
3157
166
            self.updateContentType(data['contenttype'])
168
            lfa_with_parent = getMultiAdapter(
3158
169
                (self.context.libraryfile, self.context),
3159
170
                ILibraryFileAliasWithParent)
3160
171
            lfa_with_parent.mimetype = data['contenttype']
3161
167
172
3162
168
    @action('Delete Attachment', name='delete')
173
    @action('Delete Attachment', name='delete')
3163
169
    def delete_action(self, action, data):
174
    def delete_action(self, action, data):
3164
@@ -174,20 +179,6 @@
3165
174
            url=libraryfile_url, name=self.context.title))
179
            url=libraryfile_url, name=self.context.title))
3166
175
        self.context.removeFromBug(user=self.user)
180
        self.context.removeFromBug(user=self.user)
3167
176
181
3168
177
    def updateContentType(self, new_content_type):
3169
178
        """Update the attachment content type."""
3170
179
        filealiasset = getUtility(ILibraryFileAliasSet)
3171
180
        old_filealias = self.context.libraryfile
3172
181
        # Download the file and upload it again with the new content
3173
182
        # type.
3174
183
        # XXX: Bjorn Tillenius 2005-06-30:
3175
184
        # It should be possible to simply create a new filealias
3176
185
        # with the same content as the old one.
3177
186
        old_content = old_filealias.read()
3178
187
        self.context.libraryfile = filealiasset.create(
3179
188
            name=old_filealias.filename, size=len(old_content),
3180
189
            file=StringIO(old_content), contentType=new_content_type)
3181
190
3182
191
    @property
182
    @property
3183
192
    def label(self):
183
    def label(self):
3184
193
        return smartquote('Bug #%d - Edit attachment "%s"') % (
184
        return smartquote('Bug #%d - Edit attachment "%s"') % (
3185
194
185
3186
=== added file 'lib/lp/bugs/browser/tests/test_bugattachment_edit_view.py'
3187
--- lib/lp/bugs/browser/tests/test_bugattachment_edit_view.py	1970-01-01 00:00:00 +0000
3188
+++ lib/lp/bugs/browser/tests/test_bugattachment_edit_view.py	2010-10-04 22:08:24 +0000
3189
@@ -0,0 +1,107 @@
3190
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
3191
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3192
3
3193
4
__metaclass__ = type
3194
5
3195
6
import transaction
3196
7
from zope.security.interfaces import Unauthorized
3197
8
3198
9
from canonical.testing import LaunchpadFunctionalLayer
3199
10
from lp.testing import (
3200
11
    login_person,
3201
12
    TestCaseWithFactory,
3202
13
    )
3203
14
from lp.testing.views import create_initialized_view
3204
15
3205
16
3206
17
class TestBugAttachmentEditView(TestCaseWithFactory):
3207
18
    """Tests of traversal to and access of files of bug attachments."""
3208
19
3209
20
    layer = LaunchpadFunctionalLayer
3210
21
3211
22
    CHANGE_FORM_DATA = {
3212
23
        'field.title': 'new description',
3213
24
        'field.patch': 'on',
3214
25
        'field.contenttype': 'application/whatever',
3215
26
        'field.actions.change': 'Change',
3216
27
        }
3217
28
3218
29
    def setUp(self):
3219
30
        super(TestBugAttachmentEditView, self).setUp()
3220
31
        self.bug_owner = self.factory.makePerson()
3221
32
        login_person(self.bug_owner)
3222
33
        self.bug = self.factory.makeBug(owner=self.bug_owner)
3223
34
        self.bugattachment = self.factory.makeBugAttachment(
3224
35
            bug=self.bug, filename='foo.diff', data='file content',
3225
36
            description='attachment description', content_type='text/plain',
3226
37
            is_patch=False)
3227
38
        # The Librarian server should know about the new file before
3228
39
        # we start the tests.
3229
40
        transaction.commit()
3230
41
3231
42
    def test_change_action_public_bug(self):
3232
43
        # Properties of attachments for public bugs can be
3233
44
        # changed by every user.
3234
45
        user = self.factory.makePerson()
3235
46
        login_person(user)
3236
47
        create_initialized_view(
3237
48
            self.bugattachment, name='+edit', form=self.CHANGE_FORM_DATA)
3238
49
        self.assertEqual('new description', self.bugattachment.title)
3239
50
        self.assertTrue(self.bugattachment.is_patch)
3240
51
        self.assertEqual(
3241
52
            'application/whatever', self.bugattachment.libraryfile.mimetype)
3242
53
3243
54
    def test_change_action_private_bug(self):
3244
55
        # Subscribers of a private bug can edit attachments.
3245
56
        user = self.factory.makePerson()
3246
57
        self.bug.subscribe(user, self.bug_owner)
3247
58
        self.bug.setPrivate(True, self.bug_owner)
3248
59
        transaction.commit()
3249
60
        login_person(user)
3250
61
        create_initialized_view(
3251
62
            self.bugattachment, name='+edit', form=self.CHANGE_FORM_DATA)
3252
63
        self.assertEqual('new description', self.bugattachment.title)
3253
64
        self.assertTrue(self.bugattachment.is_patch)
3254
65
        self.assertEqual(
3255
66
            'application/whatever', self.bugattachment.libraryfile.mimetype)
3256
67
3257
68
    def test_change_action_private_bug_unauthorized(self):
3258
69
        # Other users cannot edit attachments of private bugs.
3259
70
        user = self.factory.makePerson()
3260
71
        self.bug.setPrivate(True, self.bug_owner)
3261
72
        transaction.commit()
3262
73
        login_person(user)
3263
74
        self.assertRaises(
3264
75
            Unauthorized, create_initialized_view, self.bugattachment,
3265
76
            name='+edit', form=self.CHANGE_FORM_DATA)
3266
77
3267
78
    DELETE_FORM_DATA = {
3268
79
        'field.actions.delete': 'Delete Attachment',
3269
80
        }
3270
81
3271
82
    def test_delete_action_public_bug(self):
3272
83
        # Bug attachments can be removed from a bug.
3273
84
        user = self.factory.makePerson()
3274
85
        login_person(user)
3275
86
        create_initialized_view(
3276
87
            self.bugattachment, name='+edit', form=self.DELETE_FORM_DATA)
3277
88
        self.assertEqual(0, self.bug.attachments.count())
3278
89
3279
90
    def test_delete_action_private_bug(self):
3280
91
        # Subscribers of a private bug can delete attachments.
3281
92
        user = self.factory.makePerson()
3282
93
        self.bug.subscribe(user, self.bug_owner)
3283
94
        self.bug.setPrivate(True, self.bug_owner)
3284
95
        login_person(user)
3285
96
        create_initialized_view(
3286
97
            self.bugattachment, name='+edit', form=self.DELETE_FORM_DATA)
3287
98
        self.assertEqual(0, self.bug.attachments.count())
3288
99
3289
100
    def test_delete_action_private_bug_unautorized(self):
3290
101
        # Other users cannot delete private bug attachments.
3291
102
        user = self.factory.makePerson()
3292
103
        self.bug.setPrivate(True, self.bug_owner)
3293
104
        login_person(user)
3294
105
        self.assertRaises(
3295
106
            Unauthorized, create_initialized_view, self.bugattachment,
3296
107
            name='+edit', form=self.DELETE_FORM_DATA)
3297
0
108
3298
=== modified file 'lib/lp/bugs/configure.zcml'
3299
--- lib/lp/bugs/configure.zcml	2010-09-28 14:59:25 +0000
3300
+++ lib/lp/bugs/configure.zcml	2010-10-04 22:08:24 +0000
3301
@@ -368,10 +368,14 @@
3302
368
                    aliases
368
                    aliases
3303
369
                    baseurl
369
                    baseurl
3304
370
                    bugtrackertype
370
                    bugtrackertype
3305
371
                    componentForDistroSourcePackage
3306
372
                    component_groups
3307
371
                    contactdetails
373
                    contactdetails
3308
374
                    getAllRemoteComponentGroups
3309
372
                    getBugFilingAndSearchLinks
375
                    getBugFilingAndSearchLinks
3310
373
                    getBugsWatching
376
                    getBugsWatching
3311
374
                    getLinkedPersonByName
377
                    getLinkedPersonByName
3312
378
                    getRemoteComponentGroup
3313
375
                    has_lp_plugin
379
                    has_lp_plugin
3314
376
                    id
380
                    id
3315
377
                    imported_bug_messages
381
                    imported_bug_messages
3316
@@ -394,6 +398,7 @@
3317
394
                    destroySelf
398
                    destroySelf
3318
395
                    ensurePersonForSelf
399
                    ensurePersonForSelf
3319
396
                    linkPersonToSelf
400
                    linkPersonToSelf
3320
401
                    addRemoteComponentGroup
3321
397
                    "
402
                    "
3322
398
                set_attributes="
403
                set_attributes="
3323
399
                    aliases
404
                    aliases
3324
@@ -461,6 +466,47 @@
3325
461
                interface="lp.bugs.interfaces.bugtracker.IBugTrackerAliasSet"/>
466
                interface="lp.bugs.interfaces.bugtracker.IBugTrackerAliasSet"/>
3326
462
        </securedutility>
467
        </securedutility>
3327
463
468
3328
469
        <!--BugTrackerComponent -->
3329
470
3330
471
        <class
3331
472
            class="lp.bugs.model.bugtracker.BugTrackerComponent">
3332
473
            <require
3333
474
                permission="zope.Public"
3334
475
                attributes="
3335
476
                    id
3336
477
                    name
3337
478
                    is_visible
3338
479
                    is_custom
3339
480
                    "/>
3340
481
            <require
3341
482
                permission="launchpad.AnyPerson"
3342
483
                set_attributes="
3343
484
                    is_visible
3344
485
                    is_custom
3345
486
                    "/>
3346
487
            <implements
3347
488
                interface="lp.bugs.interfaces.bugtracker.IBugTrackerComponent"/>
3348
489
        </class>
3349
490
3350
491
        <!--BugTrackerComponentGroup -->
3351
492
3352
493
        <class
3353
494
            class="lp.bugs.model.bugtracker.BugTrackerComponentGroup">
3354
495
            <require
3355
496
                permission="zope.Public"
3356
497
                attributes="
3357
498
                    id
3358
499
                    name
3359
500
                    bug_tracker
3360
501
                    components
3361
502
                    getComponent
3362
503
                    addComponent
3363
504
                    addCustomComponent
3364
505
                    "/>
3365
506
            <implements
3366
507
                interface="lp.bugs.interfaces.bugtracker.IBugTrackerComponentGroup"/>
3367
508
        </class>
3368
509
3369
464
        <!-- RemoteBug -->
510
        <!-- RemoteBug -->
3370
465
511
3371
466
        <class
512
        <class
3372
467
513
3373
=== modified file 'lib/lp/bugs/doc/initial-bug-contacts.txt'
3374
--- lib/lp/bugs/doc/initial-bug-contacts.txt	2010-08-20 01:29:08 +0000
3375
+++ lib/lp/bugs/doc/initial-bug-contacts.txt	2010-10-04 22:08:24 +0000
3376
@@ -16,7 +16,7 @@
3377
16
    >>> debian = getUtility(IDistributionSet).getByName("debian")
16
    >>> debian = getUtility(IDistributionSet).getByName("debian")
3378
17
    >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")
17
    >>> debian_firefox = debian.getSourcePackage("mozilla-firefox")
3379
18
18
3381
19
    >>> debian_firefox.bug_subscriptions
19
    >>> list(debian_firefox.bug_subscriptions)
3382
20
    []
20
    []
3383
21
21
3384
22
Adding a package subscription is done with the
22
Adding a package subscription is done with the
3385
23
23
3386
=== modified file 'lib/lp/bugs/interfaces/bugtracker.py'
3387
--- lib/lp/bugs/interfaces/bugtracker.py	2010-09-19 23:52:49 +0000
3388
+++ lib/lp/bugs/interfaces/bugtracker.py	2010-10-04 22:08:24 +0000
3389
@@ -12,6 +12,8 @@
3390
12
    'IBugTracker',
12
    'IBugTracker',
3391
13
    'IBugTrackerAlias',
13
    'IBugTrackerAlias',
3392
14
    'IBugTrackerAliasSet',
14
    'IBugTrackerAliasSet',
3393
15
    'IBugTrackerComponent',
3394
16
    'IBugTrackerComponentGroup',
3395
15
    'IBugTrackerSet',
17
    'IBugTrackerSet',
3396
16
    'IRemoteBug',
18
    'IRemoteBug',
3397
17
    'SINGLE_PRODUCT_BUGTRACKERTYPES',
19
    'SINGLE_PRODUCT_BUGTRACKERTYPES',
3398
@@ -29,6 +31,7 @@
3399
29
    export_as_webservice_entry,
31
    export_as_webservice_entry,
3400
30
    export_factory_operation,
32
    export_factory_operation,
3401
31
    export_read_operation,
33
    export_read_operation,
3402
34
    export_write_operation,
3403
32
    exported,
35
    exported,
3404
33
    operation_parameters,
36
    operation_parameters,
3405
34
    operation_returns_entry,
37
    operation_returns_entry,
3406
@@ -353,6 +356,26 @@
3407
353
            point between now and 24 hours hence.
356
            point between now and 24 hours hence.
3408
354
        """
357
        """
3409
355
358
3410
359
    @operation_parameters(
3411
360
        component_group_name=TextLine(
3412
361
            title=u"The name of the remote component group", required=True))
3413
362
    @export_write_operation()
3414
363
    def addRemoteComponentGroup(component_group_name):
3415
364
        """Adds a new component group to the bug tracker"""
3416
365
3417
366
    def getAllRemoteComponentGroups():
3418
367
        """Return collection of all component groups for this bug tracker"""
3419
368
3420
369
    @operation_parameters(
3421
370
        component_group_name=TextLine(
3422
371
            title=u"The name of the remote component group", required=True))
3423
372
    @export_read_operation()
3424
373
    def getRemoteComponentGroup(component_group_name):
3425
374
        """Retrieve a given component group registered with the bug tracker.
3426
375
3427
376
        :param component_group_name: Name of the component group to retrieve.
3428
377
        """
3429
378
3430
356
379
3431
357
class IBugTrackerSet(Interface):
380
class IBugTrackerSet(Interface):
3432
358
    """A set of IBugTracker's.
381
    """A set of IBugTracker's.
3433
@@ -465,6 +488,72 @@
3434
465
        """Query IBugTrackerAliases by BugTracker."""
488
        """Query IBugTrackerAliases by BugTracker."""
3435
466
489
3436
467
490
3437
491
class IBugTrackerComponent(Interface):
3438
492
    """The software component in the remote bug tracker.
3439
493
3440
494
    Most bug trackers organize bug reports by the software 'component'
3441
495
    they affect.  This class provides a mapping of this upstream component
3442
496
    to the corresponding source package in the distro.
3443
497
    """
3444
498
    export_as_webservice_entry()
3445
499
3446
500
    id = Int(title=_('ID'), required=True, readonly=True)
3447
501
    is_visible = Bool(
3448
502
        title=_('Is Visible?'),
3449
503
        description=_("Should the component be shown in "
3450
504
                      "the Launchpad web interface?"),
3451
505
        readonly=True)
3452
506
    is_custom = Bool(
3453
507
        title=_('Is Custom?'),
3454
508
        description=_("Was the component added locally in "
3455
509
                      "Launchpad?  If it was, we must retain "
3456
510
                      "it across updates of bugtracker data."),
3457
511
        readonly=True)
3458
512
3459
513
    name = exported(
3460
514
        Text(
3461
515
            title=_('Name'),
3462
516
            constraint=name_validator,
3463
517
            description=_('The name of a software component'
3464
518
                          'in a remote bug tracker')))
3465
519
3466
520
# XXX: Bug 644794 will implement this link
3467
521
#    distro_source_package = exported(
3468
522
#        Reference(
3469
523
#            title=_('Distribution Source Package'),
3470
524
#            schema=Interface,
3471
525
#            description=_('The distribution source package for this '
3472
526
#                          'component, if one has been defined.')))
3473
527
3474
528
3475
529
class IBugTrackerComponentGroup(Interface):
3476
530
    """A collection of components in a remote bug tracker.
3477
531
3478
532
    Some bug trackers organize sets of components into higher level groups,
3479
533
    such as Bugzilla's 'product'.
3480
534
    """
3481
535
    export_as_webservice_entry()
3482
536
3483
537
    id = Int(title=_('ID'))
3484
538
    name = exported(
3485
539
        Text(
3486
540
            title=_('Name'),
3487
541
            constraint=name_validator,
3488
542
            description=_('The name of the bug tracker product.')))
3489
543
    components = exported(
3490
544
        Reference(title=_('Components'), schema=IBugTrackerComponent))
3491
545
    bug_tracker = exported(
3492
546
        Reference(title=_('BugTracker'), schema=IBugTracker))
3493
547
3494
548
    @operation_parameters(
3495
549
        component_name=TextLine(
3496
550
            title=u"The name of the remote software component to be added",
3497
551
            required=True))
3498
552
    @export_write_operation()
3499
553
    def addComponent(component_name):
3500
554
        """Adds a component to be tracked as part of this component group"""
3501
555
3502
556
3503
468
class IRemoteBug(Interface):
557
class IRemoteBug(Interface):
3504
469
    """A remote bug for a given bug tracker."""
558
    """A remote bug for a given bug tracker."""
3505
470
559
3506
471
560
3507
=== modified file 'lib/lp/bugs/model/bugmessage.py'
3508
--- lib/lp/bugs/model/bugmessage.py	2010-08-20 20:31:18 +0000
3509
+++ lib/lp/bugs/model/bugmessage.py	2010-10-04 22:08:24 +0000
3510
@@ -44,6 +44,8 @@
3511
44
        notNull=False, default=None)
44
        notNull=False, default=None)
3512
45
    remote_comment_id = StringCol(notNull=False, default=None)
45
    remote_comment_id = StringCol(notNull=False, default=None)
3513
46
    visible = BoolCol(notNull=True, default=True)
46
    visible = BoolCol(notNull=True, default=True)
3514
47
    # -- Uncomment when deployed.
3515
48
    # index = IntCol()
3516
47
49
3517
48
50
3518
49
class BugMessageSet:
51
class BugMessageSet:
3519
50
52
3520
=== added file 'lib/lp/bugs/model/bugsubscriptionfilter.py'
3521
--- lib/lp/bugs/model/bugsubscriptionfilter.py	1970-01-01 00:00:00 +0000
3522
+++ lib/lp/bugs/model/bugsubscriptionfilter.py	2010-10-04 22:08:24 +0000
3523
@@ -0,0 +1,36 @@
3524
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3525
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3526
3
3527
4
# pylint: disable-msg=E0611,W0212
3528
5
3529
6
__metaclass__ = type
3530
7
__all__ = ['BugSubscriptionFilter']
3531
8
3532
9
from storm.base import Storm
3533
10
from storm.locals import (
3534
11
    Bool,
3535
12
    Int,
3536
13
    Reference,
3537
14
    Unicode,
3538
15
    )
3539
16
3540
17
3541
18
class BugSubscriptionFilter(Storm):
3542
19
    """A filter to specialize a *structural* subscription."""
3543
20
3544
21
    __storm_table__ = "BugSubscriptionFilter"
3545
22
3546
23
    id = Int(primary=True)
3547
24
3548
25
    structural_subscription_id = Int(
3549
26
        "structuralsubscription", allow_none=False)
3550
27
    structural_subscription = Reference(
3551
28
        structural_subscription_id, "StructuralSubscription.id")
3552
29
3553
30
    find_all_tags = Bool(allow_none=False, default=False)
3554
31
    include_any_tags = Bool(allow_none=False, default=False)
3555
32
    exclude_any_tags = Bool(allow_none=False, default=False)
3556
33
3557
34
    other_parameters = Unicode()
3558
35
3559
36
    description = Unicode()
3560
0
37
3561
=== added file 'lib/lp/bugs/model/bugsubscriptionfilterimportance.py'
3562
--- lib/lp/bugs/model/bugsubscriptionfilterimportance.py	1970-01-01 00:00:00 +0000
3563
+++ lib/lp/bugs/model/bugsubscriptionfilterimportance.py	2010-10-04 22:08:24 +0000
3564
@@ -0,0 +1,29 @@
3565
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3566
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3567
3
3568
4
# pylint: disable-msg=E0611,W0212
3569
5
3570
6
__metaclass__ = type
3571
7
__all__ = ['BugSubscriptionFilterImportance']
3572
8
3573
9
from storm.base import Storm
3574
10
from storm.locals import (
3575
11
    Int,
3576
12
    Reference,
3577
13
    )
3578
14
3579
15
from canonical.database.enumcol import DBEnum
3580
16
from lp.bugs.interfaces.bugtask import BugTaskImportance
3581
17
3582
18
3583
19
class BugSubscriptionFilterImportance(Storm):
3584
20
    """Importances to filter."""
3585
21
3586
22
    __storm_table__ = "BugSubscriptionFilterImportance"
3587
23
3588
24
    id = Int(primary=True)
3589
25
3590
26
    filter_id = Int("filter", allow_none=False)
3591
27
    filter = Reference(filter_id, "BugSubscriptionFilter.id")
3592
28
3593
29
    importance = DBEnum(enum=BugTaskImportance, allow_none=False)
3594
0
30
3595
=== added file 'lib/lp/bugs/model/bugsubscriptionfilterstatus.py'
3596
--- lib/lp/bugs/model/bugsubscriptionfilterstatus.py	1970-01-01 00:00:00 +0000
3597
+++ lib/lp/bugs/model/bugsubscriptionfilterstatus.py	2010-10-04 22:08:24 +0000
3598
@@ -0,0 +1,29 @@
3599
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3600
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3601
3
3602
4
# pylint: disable-msg=E0611,W0212
3603
5
3604
6
__metaclass__ = type
3605
7
__all__ = ['BugSubscriptionFilterStatus']
3606
8
3607
9
from storm.base import Storm
3608
10
from storm.locals import (
3609
11
    Int,
3610
12
    Reference,
3611
13
    )
3612
14
3613
15
from canonical.database.enumcol import DBEnum
3614
16
from lp.bugs.interfaces.bugtask import BugTaskStatus
3615
17
3616
18
3617
19
class BugSubscriptionFilterStatus(Storm):
3618
20
    """Statuses to filter."""
3619
21
3620
22
    __storm_table__ = "BugSubscriptionFilterStatus"
3621
23
3622
24
    id = Int(primary=True)
3623
25
3624
26
    filter_id = Int("filter", allow_none=False)
3625
27
    filter = Reference(filter_id, "BugSubscriptionFilter.id")
3626
28
3627
29
    status = DBEnum(enum=BugTaskStatus, allow_none=False)
3628
0
30
3629
=== added file 'lib/lp/bugs/model/bugsubscriptionfiltertag.py'
3630
--- lib/lp/bugs/model/bugsubscriptionfiltertag.py	1970-01-01 00:00:00 +0000
3631
+++ lib/lp/bugs/model/bugsubscriptionfiltertag.py	2010-10-04 22:08:24 +0000
3632
@@ -0,0 +1,29 @@
3633
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
3634
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3635
3
3636
4
# pylint: disable-msg=E0611,W0212
3637
5
3638
6
__metaclass__ = type
3639
7
__all__ = ['BugSubscriptionFilterTag']
3640
8
3641
9
from storm.base import Storm
3642
10
from storm.locals import (
3643
11
    Bool,
3644
12
    Int,
3645
13
    Reference,
3646
14
    Unicode,
3647
15
    )
3648
16
3649
17
3650
18
class BugSubscriptionFilterTag(Storm):
3651
19
    """Tags to filter."""
3652
20
3653
21
    __storm_table__ = "BugSubscriptionFilterTag"
3654
22
3655
23
    id = Int(primary=True)
3656
24
3657
25
    filter_id = Int("filter", allow_none=False)
3658
26
    filter = Reference(filter_id, "BugSubscriptionFilter.id")
3659
27
3660
28
    include = Bool(allow_none=False)
3661
29
    tag = Unicode(allow_none=False)
3662
0
30
3663
=== modified file 'lib/lp/bugs/model/bugtracker.py'
3664
--- lib/lp/bugs/model/bugtracker.py	2010-09-19 00:35:22 +0000
3665
+++ lib/lp/bugs/model/bugtracker.py	2010-10-04 22:08:24 +0000
3666
@@ -6,12 +6,14 @@
3667
6
__metaclass__ = type
6
__metaclass__ = type
3668
7
__all__ = [
7
__all__ = [
3669
8
    'BugTracker',
8
    'BugTracker',
3670
9
    'BugTrackerSet',
3671
9
    'BugTrackerAlias',
10
    'BugTrackerAlias',
3672
10
    'BugTrackerAliasSet',
11
    'BugTrackerAliasSet',
3673
12
    'BugTrackerComponent',
3674
13
    'BugTrackerComponentGroup',
3675
11
    'BugTrackerSet',
14
    'BugTrackerSet',
3676
12
    ]
15
    ]
3677
13
16
3678
14
3679
15
from datetime import datetime
17
from datetime import datetime
3680
16
from itertools import chain
18
from itertools import chain
3681
17
# splittype is not formally documented, but is in urllib.__all__, is
19
# splittype is not formally documented, but is in urllib.__all__, is
3682
@@ -22,9 +24,15 @@
3683
22
    splittype,
24
    splittype,
3684
23
    )
25
    )
3685
24
26
3686
27
from storm.base import Storm
3687
28
from storm.locals import (
3688
29
        Int,
3689
30
        Reference,
3690
31
        ReferenceSet,
3691
32
        Unicode,
3692
33
        )
3693
25
from zope.component import getUtility
34
from zope.component import getUtility
3694
26
from zope.interface import implements
35
from zope.interface import implements
3695
27
from zope.security.interfaces import Unauthorized
3696
28
36
3697
29
from lazr.uri import URI
37
from lazr.uri import URI
3698
30
from pytz import timezone
38
from pytz import timezone
3699
@@ -45,8 +53,6 @@
3700
45
    )
53
    )
3701
46
from storm.locals import Bool
54
from storm.locals import Bool
3702
47
from storm.store import Store
55
from storm.store import Store
3703
48
from zope.component import getUtility
3704
49
from zope.interface import implements
3705
50
56
3706
51
from canonical.database.enumcol import EnumCol
57
from canonical.database.enumcol import EnumCol
3707
52
from canonical.database.sqlbase import (
58
from canonical.database.sqlbase import (
3708
@@ -64,6 +70,8 @@
3709
64
    IBugTracker,
70
    IBugTracker,
3710
65
    IBugTrackerAlias,
71
    IBugTrackerAlias,
3711
66
    IBugTrackerAliasSet,
72
    IBugTrackerAliasSet,
3712
73
    IBugTrackerComponent,
3713
74
    IBugTrackerComponentGroup,
3714
67
    IBugTrackerSet,
75
    IBugTrackerSet,
3715
68
    SINGLE_PRODUCT_BUGTRACKERTYPES,
76
    SINGLE_PRODUCT_BUGTRACKERTYPES,
3716
69
    )
77
    )
3717
@@ -518,6 +526,41 @@
3718
518
            next_check=new_next_check, lastchecked=None,
526
            next_check=new_next_check, lastchecked=None,
3719
519
            last_error_type=None)
527
            last_error_type=None)
3720
520
528
3721
529
    def addRemoteComponentGroup(self, component_group_name):
3722
530
        """See `IBugTracker`."""
3723
531
3724
532
        if component_group_name is None:
3725
533
            component_group_name = "default"
3726
534
        component_group = BugTrackerComponentGroup()
3727
535
        component_group.name = component_group_name
3728
536
        component_group.bug_tracker = self
3729
537
3730
538
        store = IStore(BugTrackerComponentGroup)
3731
539
        store.add(component_group)
3732
540
        store.commit()
3733
541
3734
542
        return component_group
3735
543
3736
544
    def getAllRemoteComponentGroups(self):
3737
545
        """See `IBugTracker`."""
3738
546
        component_groups = []
3739
547
3740
548
        component_groups = Store.of(self).find(
3741
549
            BugTrackerComponentGroup,
3742
550
            BugTrackerComponentGroup.bug_tracker == self.id)
3743
551
        component_groups = component_groups.order_by(
3744
552
            BugTrackerComponentGroup.name)
3745
553
        return component_groups
3746
554
3747
555
    def getRemoteComponentGroup(self, component_group_name):
3748
556
        """See `IBugTracker`."""
3749
557
        component_group = None
3750
558
        store = IStore(BugTrackerComponentGroup)
3751
559
        component_group = store.find(
3752
560
            BugTrackerComponentGroup,
3753
561
            name = component_group_name).one()
3754
562
        return component_group
3755
563
3756
521
564
3757
522
class BugTrackerSet:
565
class BugTrackerSet:
3758
523
    """Implements IBugTrackerSet for a container or set of BugTrackers,
566
    """Implements IBugTrackerSet for a container or set of BugTrackers,
3759
@@ -627,9 +670,11 @@
3760
627
670
3761
628
    def getMostActiveBugTrackers(self, limit=None):
671
    def getMostActiveBugTrackers(self, limit=None):
3762
629
        """See `IBugTrackerSet`."""
672
        """See `IBugTrackerSet`."""
3766
630
        store = IStore(self.table)
673
        store = IStore(BugTracker)
3767
631
        result = store.find(self.table, self.table.id == BugWatch.bugtrackerID)
674
        result = store.find(
3768
632
        result = result.group_by(self.table)
675
            BugTracker,
3769
676
            BugTracker.id == BugWatch.bugtrackerID)
3770
677
        result = result.group_by(BugTracker)
3771
633
        result = result.order_by(Desc(Count(BugWatch)))
678
        result = result.order_by(Desc(Count(BugWatch)))
3772
634
        if limit is not None:
679
        if limit is not None:
3773
635
            return result[:limit]
680
            return result[:limit]
3774
@@ -671,3 +716,91 @@
3775
671
    def queryByBugTracker(self, bugtracker):
716
    def queryByBugTracker(self, bugtracker):
3776
672
        """See IBugTrackerSet."""
717
        """See IBugTrackerSet."""
3777
673
        return self.table.selectBy(bugtracker=bugtracker.id)
718
        return self.table.selectBy(bugtracker=bugtracker.id)
3778
719
3779
720
3780
721
class BugTrackerComponent(Storm):
3781
722
    """The software component in the remote bug tracker.
3782
723
3783
724
    Most bug trackers organize bug reports by the software 'component'
3784
725
    they affect.  This class provides a mapping of this upstream component
3785
726
    to the corresponding source package in the distro.
3786
727
    """
3787
728
    implements(IBugTrackerComponent)
3788
729
    __storm_table__ = 'BugTrackerComponent'
3789
730
3790
731
    id = Int(primary=True)
3791
732
    name = Unicode(allow_none=False)
3792
733
3793
734
    component_group_id = Int('component_group')
3794
735
    component_group = Reference(
3795
736
        component_group_id,
3796
737
        'BugTrackerComponentGroup.id')
3797
738
3798
739
    is_visible = Bool(allow_none=False)
3799
740
    is_custom = Bool(allow_none=False)
3800
741
3801
742
    distro_source_package_id = Int('distro_source_package')
3802
743
    distro_source_package = Reference(
3803
744
        distro_source_package_id,
3804
745
        'DistributionSourcePackageInDatabase.id')
3805
746
3806
747
3807
748
class BugTrackerComponentGroup(Storm):
3808
749
    """A collection of components in a remote bug tracker.
3809
750
3810
751
    Some bug trackers organize sets of components into higher level groups,
3811
752
    such as Bugzilla's 'product'.
3812
753
    """
3813
754
    implements(IBugTrackerComponentGroup)
3814
755
    __storm_table__ = 'BugTrackerComponentGroup'
3815
756
3816
757
    id = Int(primary=True)
3817
758
    name = Unicode(allow_none=False)
3818
759
    bug_tracker_id = Int('bug_tracker')
3819
760
    bug_tracker = Reference(bug_tracker_id, 'BugTracker.id')
3820
761
    components = ReferenceSet(
3821
762
        id,
3822
763
        BugTrackerComponent.component_group_id,
3823
764
        order_by=BugTrackerComponent.name)
3824
765
3825
766
    def addComponent(self, component_name):
3826
767
        """Adds a component that is synced from a remote bug tracker"""
3827
768
3828
769
        component = BugTrackerComponent()
3829
770
        component.name = component_name
3830
771
        component.component_group = self
3831
772
3832
773
        store = IStore(BugTrackerComponent)
3833
774
        store.add(component)
3834
775
        store.flush()
3835
776
3836
777
        return component
3837
778
3838
779
    def getComponent(self, component_name):
3839
780
        """Retrieves a component by the given name.
3840
781
3841
782
        None is returned if there is no component by that name in the
3842
783
        group.
3843
784
        """
3844
785
3845
786
        if component_name is None:
3846
787
            return None
3847
788
        else:
3848
789
            return Store.of(self).find(
3849
790
                BugTrackerComponent,
3850
791
                (BugTrackerComponent.name == component_name)).one()
3851
792
3852
793
    def addCustomComponent(self, component_name):
3853
794
        """Adds a component locally that isn't synced from a remote tracker
3854
795
        """
3855
796
3856
797
        component = BugTrackerComponent()
3857
798
        component.name = component_name
3858
799
        component.component_group = self
3859
800
        component.is_custom = True
3860
801
3861
802
        store = IStore(BugTrackerComponent)
3862
803
        store.add(component)
3863
804
        store.flush()
3864
805
3865
806
        return component
3866
674
807
3867
=== added directory 'lib/lp/bugs/model/tests'
3868
=== added file 'lib/lp/bugs/model/tests/__init__.py'
3869
=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py'
3870
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	1970-01-01 00:00:00 +0000
3871
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	2010-10-04 22:08:24 +0000
3872
@@ -0,0 +1,66 @@
3873
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
3874
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3875
3
3876
4
"""Tests for the bugsubscription module."""
3877
5
3878
6
__metaclass__ = type
3879
7
3880
8
from canonical.launchpad.interfaces.lpstorm import IStore
3881
9
from canonical.testing import DatabaseFunctionalLayer
3882
10
from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
3883
11
from lp.testing import (
3884
12
    login_person,
3885
13
    TestCaseWithFactory,
3886
14
    )
3887
15
3888
16
3889
17
class TestBugSubscriptionFilter(TestCaseWithFactory):
3890
18
3891
19
    layer = DatabaseFunctionalLayer
3892
20
3893
21
    def setUp(self):
3894
22
        super(TestBugSubscriptionFilter, self).setUp()
3895
23
        self.target = self.factory.makeProduct()
3896
24
        self.subscriber = self.target.owner
3897
25
        login_person(self.subscriber)
3898
26
        self.subscription = self.target.addBugSubscription(
3899
27
            self.subscriber, self.subscriber)
3900
28
3901
29
    def test_basics(self):
3902
30
        """Test the basic operation of `BugSubscriptionFilter` objects."""
3903
31
        # Create.
3904
32
        bug_subscription_filter = BugSubscriptionFilter()
3905
33
        bug_subscription_filter.structural_subscription = self.subscription
3906
34
        bug_subscription_filter.find_all_tags = True
3907
35
        bug_subscription_filter.include_any_tags = True
3908
36
        bug_subscription_filter.exclude_any_tags = True
3909
37
        bug_subscription_filter.other_parameters = u"foo"
3910
38
        bug_subscription_filter.description = u"bar"
3911
39
        # Flush and reload.
3912
40
        IStore(bug_subscription_filter).flush()
3913
41
        IStore(bug_subscription_filter).reload(bug_subscription_filter)
3914
42
        # Check.
3915
43
        self.assertIsNot(None, bug_subscription_filter.id)
3916
44
        self.assertEqual(
3917
45
            self.subscription.id,
3918
46
            bug_subscription_filter.structural_subscription_id)
3919
47
        self.assertEqual(
3920
48
            self.subscription,
3921
49
            bug_subscription_filter.structural_subscription)
3922
50
        self.assertIs(True, bug_subscription_filter.find_all_tags)
3923
51
        self.assertIs(True, bug_subscription_filter.include_any_tags)
3924
52
        self.assertIs(True, bug_subscription_filter.exclude_any_tags)
3925
53
        self.assertEqual(u"foo", bug_subscription_filter.other_parameters)
3926
54
        self.assertEqual(u"bar", bug_subscription_filter.description)
3927
55
3928
56
    def test_defaults(self):
3929
57
        """Test the default values of `BugSubscriptionFilter` objects."""
3930
58
        # Create.
3931
59
        bug_subscription_filter = BugSubscriptionFilter()
3932
60
        bug_subscription_filter.structural_subscription = self.subscription
3933
61
        # Check.
3934
62
        self.assertIs(False, bug_subscription_filter.find_all_tags)
3935
63
        self.assertIs(False, bug_subscription_filter.include_any_tags)
3936
64
        self.assertIs(False, bug_subscription_filter.exclude_any_tags)
3937
65
        self.assertIs(None, bug_subscription_filter.other_parameters)
3938
66
        self.assertIs(None, bug_subscription_filter.description)
3939
0
67
3940
=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py'
3941
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py	1970-01-01 00:00:00 +0000
3942
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterimportance.py	2010-10-04 22:08:24 +0000
3943
@@ -0,0 +1,54 @@
3944
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
3945
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3946
3
3947
4
"""Tests for the bugsubscription module."""
3948
5
3949
6
__metaclass__ = type
3950
7
3951
8
from canonical.launchpad.interfaces.lpstorm import IStore
3952
9
from canonical.testing import DatabaseFunctionalLayer
3953
10
from lp.bugs.interfaces.bugtask import BugTaskImportance
3954
11
from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
3955
12
from lp.bugs.model.bugsubscriptionfilterimportance import (
3956
13
    BugSubscriptionFilterImportance,
3957
14
    )
3958
15
from lp.testing import (
3959
16
    login_person,
3960
17
    TestCaseWithFactory,
3961
18
    )
3962
19
3963
20
3964
21
class TestBugSubscriptionFilterImportance(TestCaseWithFactory):
3965
22
3966
23
    layer = DatabaseFunctionalLayer
3967
24
3968
25
    def setUp(self):
3969
26
        super(TestBugSubscriptionFilterImportance, self).setUp()
3970
27
        self.target = self.factory.makeProduct()
3971
28
        self.subscriber = self.target.owner
3972
29
        login_person(self.subscriber)
3973
30
        self.subscription = self.target.addBugSubscription(
3974
31
            self.subscriber, self.subscriber)
3975
32
        self.subscription_filter = BugSubscriptionFilter()
3976
33
        self.subscription_filter.structural_subscription = self.subscription
3977
34
3978
35
    def test_basics(self):
3979
36
        """Test the basics of `BugSubscriptionFilterImportance` objects."""
3980
37
        # Create.
3981
38
        bug_sub_filter_importance = BugSubscriptionFilterImportance()
3982
39
        bug_sub_filter_importance.filter = self.subscription_filter
3983
40
        bug_sub_filter_importance.importance = BugTaskImportance.HIGH
3984
41
        # Flush and reload.
3985
42
        IStore(bug_sub_filter_importance).flush()
3986
43
        IStore(bug_sub_filter_importance).reload(bug_sub_filter_importance)
3987
44
        # Check.
3988
45
        self.assertIsNot(None, bug_sub_filter_importance.id)
3989
46
        self.assertEqual(
3990
47
            self.subscription_filter.id,
3991
48
            bug_sub_filter_importance.filter_id)
3992
49
        self.assertEqual(
3993
50
            self.subscription_filter,
3994
51
            bug_sub_filter_importance.filter)
3995
52
        self.assertEqual(
3996
53
            BugTaskImportance.HIGH,
3997
54
            bug_sub_filter_importance.importance)
3998
0
55
3999
=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py'
4000
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py	1970-01-01 00:00:00 +0000
4001
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilterstatus.py	2010-10-04 22:08:24 +0000
4002
@@ -0,0 +1,52 @@
4003
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
4004
2
# GNU Affero General Public License version 3 (see the file LICENSE).
4005
3
4006
4
"""Tests for the bugsubscription module."""
4007
5
4008
6
__metaclass__ = type
4009
7
4010
8
from canonical.launchpad.interfaces.lpstorm import IStore
4011
9
from canonical.testing import DatabaseFunctionalLayer
4012
10
from lp.bugs.interfaces.bugtask import BugTaskStatus
4013
11
from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
4014
12
from lp.bugs.model.bugsubscriptionfilterstatus import (
4015
13
    BugSubscriptionFilterStatus,
4016
14
    )
4017
15
from lp.testing import (
4018
16
    login_person,
4019
17
    TestCaseWithFactory,
4020
18
    )
4021
19
4022
20
4023
21
class TestBugSubscriptionFilterStatus(TestCaseWithFactory):
4024
22
4025
23
    layer = DatabaseFunctionalLayer
4026
24
4027
25
    def setUp(self):
4028
26
        super(TestBugSubscriptionFilterStatus, self).setUp()
4029
27
        self.target = self.factory.makeProduct()
4030
28
        self.subscriber = self.target.owner
4031
29
        login_person(self.subscriber)
4032
30
        self.subscription = self.target.addBugSubscription(
4033
31
            self.subscriber, self.subscriber)
4034
32
        self.subscription_filter = BugSubscriptionFilter()
4035
33
        self.subscription_filter.structural_subscription = self.subscription
4036
34
4037
35
    def test_basics(self):
4038
36
        """Test the basics of `BugSubscriptionFilterStatus` objects."""
4039
37
        # Create.
4040
38
        bug_sub_filter_status = BugSubscriptionFilterStatus()
4041
39
        bug_sub_filter_status.filter = self.subscription_filter
4042
40
        bug_sub_filter_status.status = BugTaskStatus.NEW
4043
41
        # Flush and reload.
4044
42
        IStore(bug_sub_filter_status).flush()
4045
43
        IStore(bug_sub_filter_status).reload(bug_sub_filter_status)
4046
44
        # Check.
4047
45
        self.assertIsNot(None, bug_sub_filter_status.id)
4048
46
        self.assertEqual(
4049
47
            self.subscription_filter.id,
4050
48
            bug_sub_filter_status.filter_id)
4051
49
        self.assertEqual(
4052
50
            self.subscription_filter,
4053
51
            bug_sub_filter_status.filter)
4054
52
        self.assertEqual(BugTaskStatus.NEW, bug_sub_filter_status.status)
4055
0
53
4056
=== added file 'lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py'
4057
--- lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py	1970-01-01 00:00:00 +0000
4058
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfiltertag.py	2010-10-04 22:08:24 +0000
4059
@@ -0,0 +1,51 @@
4060
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
4061
2
# GNU Affero General Public License version 3 (see the file LICENSE).
4062
3
4063
4
"""Tests for the bugsubscription module."""
4064
5
4065
6
__metaclass__ = type
4066
7
4067
8
from canonical.launchpad.interfaces.lpstorm import IStore
4068
9
from canonical.testing import DatabaseFunctionalLayer
4069
10
from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilter
4070
11
from lp.bugs.model.bugsubscriptionfiltertag import BugSubscriptionFilterTag
4071
12
from lp.testing import (
4072
13
    login_person,
4073
14
    TestCaseWithFactory,
4074
15
    )
4075
16
4076
17
4077
18
class TestBugSubscriptionFilterTag(TestCaseWithFactory):
4078
19
4079
20
    layer = DatabaseFunctionalLayer
4080
21
4081
22
    def setUp(self):
4082
23
        super(TestBugSubscriptionFilterTag, self).setUp()
4083
24
        self.target = self.factory.makeProduct()
4084
25
        self.subscriber = self.target.owner
4085
26
        login_person(self.subscriber)
4086
27
        self.subscription = self.target.addBugSubscription(
4087
28
            self.subscriber, self.subscriber)
4088
29
        self.subscription_filter = BugSubscriptionFilter()
4089
30
        self.subscription_filter.structural_subscription = self.subscription
4090
31
4091
32
    def test_basics(self):
4092
33
        """Test the basics of `BugSubscriptionFilterTag` objects."""
4093
34
        # Create.
4094
35
        bug_sub_filter_tag = BugSubscriptionFilterTag()
4095
36
        bug_sub_filter_tag.filter = self.subscription_filter
4096
37
        bug_sub_filter_tag.include = True
4097
38
        bug_sub_filter_tag.tag = u"foo"
4098
39
        # Flush and reload.
4099
40
        IStore(bug_sub_filter_tag).flush()
4100
41
        IStore(bug_sub_filter_tag).reload(bug_sub_filter_tag)
4101
42
        # Check.
4102
43
        self.assertIsNot(None, bug_sub_filter_tag.id)
4103
44
        self.assertEqual(
4104
45
            self.subscription_filter.id,
4105
46
            bug_sub_filter_tag.filter_id)
4106
47
        self.assertEqual(
4107
48
            self.subscription_filter,
4108
49
            bug_sub_filter_tag.filter)
4109
50
        self.assertIs(True, bug_sub_filter_tag.include)
4110
51
        self.assertEqual(u"foo", bug_sub_filter_tag.tag)
4111
0
52
4112
=== modified file 'lib/lp/bugs/tests/has-bug-supervisor.txt'
4113
--- lib/lp/bugs/tests/has-bug-supervisor.txt	2009-08-25 11:21:05 +0000
4114
+++ lib/lp/bugs/tests/has-bug-supervisor.txt	2010-10-04 22:08:24 +0000
4115
@@ -5,7 +5,7 @@
4116
5
structural subscription targets. When the bug supervisor for such an object
5
structural subscription targets. When the bug supervisor for such an object
4117
6
is set, a new bug subscription is created as well.
6
is set, a new bug subscription is created as well.
4118
7
7
4120
8
    >>> target.bug_subscriptions
8
    >>> list(target.bug_subscriptions)
4121
9
    []
9
    []
4122
10
10
4123
11
    >>> print target.bug_supervisor
11
    >>> print target.bug_supervisor
4124
12
12
4125
=== added file 'lib/lp/bugs/tests/test_bugtracker_components.py'
4126
--- lib/lp/bugs/tests/test_bugtracker_components.py	1970-01-01 00:00:00 +0000
4127
+++ lib/lp/bugs/tests/test_bugtracker_components.py	2010-10-04 22:08:24 +0000
4128
@@ -0,0 +1,176 @@
4129
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
4130
2
# GNU Affero General Public License version 3 (see the file LICENSE).
4131
3
4132
4
"""Test for components and component groups (products) in bug trackers."""
4133
5
4134
6
__metaclass__ = type
4135
7
4136
8
__all__ = []
4137
9
4138
10
import unittest
4139
11
4140
12
from canonical.launchpad.ftests import login_person
4141
13
from canonical.testing import DatabaseFunctionalLayer
4142
14
from lp.testing import TestCaseWithFactory
4143
15
4144
16
class TestBugTrackerComponent(TestCaseWithFactory):
4145
17
4146
18
    layer = DatabaseFunctionalLayer
4147
19
4148
20
    def setUp(self):
4149
21
        super(TestBugTrackerComponent, self).setUp()
4150
22
4151
23
        regular_user = self.factory.makePerson()
4152
24
        login_person(regular_user)
4153
25
4154
26
        self.bug_tracker = self.factory.makeBugTracker()
4155
27
4156
28
        self.comp_group = self.factory.makeBugTrackerComponentGroup(
4157
29
            u'alpha',
4158
30
            self.bug_tracker)
4159
31
4160
32
    def test_component_creation(self):
4161
33
        """Verify a component can be created"""
4162
34
        component = self.factory.makeBugTrackerComponent(
4163
35
            u'example', self.comp_group)
4164
36
        self.assertTrue(component is not None)
4165
37
        self.assertEqual(component.name, u'example')
4166
38
4167
39
    def test_set_visibility(self):
4168
40
        """Users can delete components
4169
41
4170
42
        In case invalid components get imported from a remote bug
4171
43
        tracker, users can hide them so they don't show up in the UI.
4172
44
        We do this rather than delete them outright so that they won't
4173
45
        show up again when we re-sync from the remote bug tracker.
4174
46
        """
4175
47
        component = self.factory.makeBugTrackerComponent(
4176
48
            u'example', self.comp_group)
4177
49
        self.assertEqual(component.is_visible, True)
4178
50
4179
51
        component.is_visible = False
4180
52
        self.assertEqual(component.is_visible, False)
4181
53
4182
54
        component.is_visible = True
4183
55
        self.assertEqual(component.is_visible, True)
4184
56
4185
57
    def test_custom_component(self):
4186
58
        """Users can also add components
4187
59
4188
60
        For whatever reason, it may be that we can't import a component
4189
61
        from the remote bug tracker.  This gives users a way to correct
4190
62
        the omissions."""
4191
63
        custom_component = self.factory.makeBugTrackerComponent(
4192
64
            u'example', self.comp_group, custom=True)
4193
65
        self.assertTrue(custom_component != None)
4194
66
        self.assertEqual(custom_component.is_custom, True)
4195
67
4196
68
    def test_multiple_component_creation(self):
4197
69
        """Verify several components can be created at once"""
4198
70
        comp_a = self.factory.makeBugTrackerComponent(
4199
71
            u'example-a', self.comp_group)
4200
72
        comp_b = self.factory.makeBugTrackerComponent(
4201
73
            u'example-b', self.comp_group)
4202
74
        comp_c = self.factory.makeBugTrackerComponent(
4203
75
            u'example-c', self.comp_group, True)
4204
76
4205
77
        self.assertTrue(comp_a is not None)
4206
78
        self.assertTrue(comp_b is not None)
4207
79
        self.assertTrue(comp_c is not None)
4208
80
4209
81
4210
82
class TestBugTrackerWithComponents(TestCaseWithFactory):
4211
83
4212
84
    layer = DatabaseFunctionalLayer
4213
85
4214
86
    def setUp(self):
4215
87
        super(TestBugTrackerWithComponents, self).setUp()
4216
88
4217
89
        regular_user = self.factory.makePerson()
4218
90
        login_person(regular_user)
4219
91
4220
92
        self.bug_tracker = self.factory.makeBugTracker()
4221
93
4222
94
    def test_empty_bugtracker(self):
4223
95
        """Trivial case of bugtracker with no products or components"""
4224
96
        self.assertTrue(self.bug_tracker is not None)
4225
97
4226
98
        # Empty bugtrackers shouldn't return component groups
4227
99
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'non-existant')
4228
100
        self.assertEqual(comp_group, None)
4229
101
4230
102
        # Verify it contains no component groups
4231
103
        comp_groups = self.bug_tracker.getAllRemoteComponentGroups()
4232
104
        self.assertEqual(len(list(comp_groups)), 0)
4233
105
4234
106
    def test_single_product_bugtracker(self):
4235
107
        """Bug tracker with a single (default) product and several components
4236
108
        """
4237
109
        # Add a component group and fill it with some components
4238
110
        default_comp_group = self.bug_tracker.addRemoteComponentGroup(
4239
111
            u'alpha')
4240
112
        default_comp_group.addComponent(u'example-a')
4241
113
        default_comp_group.addComponent(u'example-b')
4242
114
        default_comp_group.addComponent(u'example-c')
4243
115
4244
116
        # Verify that retrieving an invalid component group returns nothing
4245
117
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'non-existant')
4246
118
        self.assertEqual(comp_group, None)
4247
119
4248
120
        # Now retrieve the component group we added
4249
121
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'alpha')
4250
122
        self.assertEqual(comp_group, default_comp_group)
4251
123
        self.assertEqual(comp_group.name, u'alpha')
4252
124
4253
125
        # Verify there is only the one component group in the tracker
4254
126
        comp_groups = self.bug_tracker.getAllRemoteComponentGroups()
4255
127
        self.assertEqual(len(list(comp_groups)), 1)
4256
128
4257
129
    def test_multiple_product_bugtracker(self):
4258
130
        """Bug tracker with multiple products and components"""
4259
131
        # Create several component groups with varying numbers of components
4260
132
        comp_group_i = self.bug_tracker.addRemoteComponentGroup(u'alpha')
4261
133
4262
134
        comp_group_ii = self.bug_tracker.addRemoteComponentGroup(u'beta')
4263
135
        comp_group_ii.addComponent(u'example-beta-1')
4264
136
4265
137
        comp_group_iii = self.bug_tracker.addRemoteComponentGroup(u'gamma')
4266
138
        comp_group_iii.addComponent(u'example-gamma-1')
4267
139
        comp_group_iii.addComponent(u'example-gamma-2')
4268
140
        comp_group_iii.addComponent(u'example-gamma-3')
4269
141
4270
142
        # Retrieving a non-existant component group returns nothing
4271
143
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'non-existant')
4272
144
        self.assertEqual(comp_group, None)
4273
145
4274
146
        # Now retrieve one of the real component groups
4275
147
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'beta')
4276
148
        self.assertEqual(comp_group, comp_group_ii)
4277
149
4278
150
        # Check the correct number of component groups are in the bug tracker
4279
151
        comp_groups = self.bug_tracker.getAllRemoteComponentGroups()
4280
152
        self.assertEqual(len(list(comp_groups)), 3)
4281
153
4282
154
    def test_get_components_for_component_group(self):
4283
155
        """Retrieve a set of components from a given product"""
4284
156
        # Create a component group with some components
4285
157
        default_comp_group = self.bug_tracker.addRemoteComponentGroup(
4286
158
            u'alpha')
4287
159
        default_comp_group.addComponent(u'example-a')
4288
160
        default_comp_group.addComponent(u'example-b')
4289
161
        default_comp_group.addComponent(u'example-c')
4290
162
4291
163
        # Verify group has the correct number of components
4292
164
        comp_group = self.bug_tracker.getRemoteComponentGroup(u'alpha')
4293
165
        self.assertEqual(len(list(comp_group.components)), 3)
4294
166
4295
167
        # Check one of the components, that it is what we expect
4296
168
        comp = comp_group.getComponent(u'example-b')
4297
169
        self.assertEqual(comp.name, u'example-b')
4298
170
4299
171
4300
172
def test_suite():
4301
173
    suite = unittest.TestSuite()
4302
174
    suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))
4303
175
4304
176
    return suite
4305
0
177
4306
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
4307
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-09-16 12:27:46 +0000
4308
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-10-04 22:08:24 +0000
4309
@@ -1,4 +1,4 @@
4311
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
1
# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
4312
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
4313
3
3
4314
4
# pylint: disable-msg=E0211,E0213
4
# pylint: disable-msg=E0211,E0213
4315
@@ -256,6 +256,15 @@
4316
256
256
4317
257
    was_built = Attribute("Whether or not modified by the builddfarm.")
257
    was_built = Attribute("Whether or not modified by the builddfarm.")
4318
258
258
4319
259
    # This doesn't belong here.  It really belongs in IPackageBuild, but
4320
260
    # the TAL assumes it can read this directly.
4321
261
    dependencies = exported(
4322
262
        TextLine(
4323
263
            title=_('Dependencies'), required=False,
4324
264
            description=_(
4325
265
                'Debian-like dependency line that must be satisfied before '
4326
266
                'attempting to build this request.')))
4327
267
4328
259
268
4329
260
class ISpecificBuildFarmJob(IBuildFarmJob):
269
class ISpecificBuildFarmJob(IBuildFarmJob):
4330
261
    """A marker interface with which to define adapters for IBuildFarmJob.
270
    """A marker interface with which to define adapters for IBuildFarmJob.
4331
262
271
4332
=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
4333
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-09-10 12:29:36 +0000
4334
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2010-10-04 22:08:24 +0000
4335
@@ -61,12 +61,6 @@
4336
61
            description=_("A URL for failed upload logs."
61
            description=_("A URL for failed upload logs."
4337
62
                          "Will be None if there was no failure.")))
62
                          "Will be None if there was no failure.")))
4338
63
63
4339
64
    dependencies = exported(
4340
65
        TextLine(
4341
66
            title=_('Dependencies'), required=False,
4342
67
            description=_('Debian-like dependency line that must be satisfied'
4343
68
                          ' before attempting to build this request.')))
4344
69
4345
70
    build_farm_job = Reference(
64
    build_farm_job = Reference(
4346
71
        title=_('Build farm job'), schema=IBuildFarmJob, required=True,
65
        title=_('Build farm job'), schema=IBuildFarmJob, required=True,
4347
72
        readonly=True, description=_('The base build farm job.'))
66
        readonly=True, description=_('The base build farm job.'))
4348
73
67
4349
=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
4350
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-09-16 12:27:46 +0000
4351
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-10-04 22:08:24 +0000
4352
@@ -237,6 +237,8 @@
4353
237
237
4354
238
    failure_count = Int(name='failure_count', allow_none=False)
238
    failure_count = Int(name='failure_count', allow_none=False)
4355
239
239
4356
240
    dependencies = None
4357
241
4358
240
    def __init__(self, job_type, status=BuildStatus.NEEDSBUILD,
242
    def __init__(self, job_type, status=BuildStatus.NEEDSBUILD,
4359
241
                 processor=None, virtualized=None, date_created=None):
243
                 processor=None, virtualized=None, date_created=None):
4360
242
        super(BuildFarmJob, self).__init__()
244
        super(BuildFarmJob, self).__init__()
4361
@@ -273,7 +275,7 @@
4362
273
        return self.date_finished - self.date_started
275
        return self.date_finished - self.date_started
4363
274
276
4364
275
    def makeJob(self):
277
    def makeJob(self):
4366
276
        """See `IBuildFarmJob`."""
278
        """See `IBuildFarmJobOld`."""
4367
277
        raise NotImplementedError
279
        raise NotImplementedError
4368
278
280
4369
279
    def jobStarted(self):
281
    def jobStarted(self):
4370
@@ -420,7 +422,8 @@
4371
420
            # specific private builds to which they have access.
422
            # specific private builds to which they have access.
4372
421
            origin.extend(left_join_archive)
423
            origin.extend(left_join_archive)
4373
422
            origin.append(LeftJoin(
424
            origin.append(LeftJoin(
4375
423
                TeamParticipation, TeamParticipation.teamID == Archive.ownerID))
425
                TeamParticipation,
4376
426
                TeamParticipation.teamID == Archive.ownerID))
4377
424
            extra_clauses.append(
427
            extra_clauses.append(
4378
425
                Or(Coalesce(Archive.private, False) == False,
428
                Or(Coalesce(Archive.private, False) == False,
4379
426
                   TeamParticipation.person == user))
429
                   TeamParticipation.person == user))
4380
427
430
4381
=== modified file 'lib/lp/code/browser/branch.py'
4382
--- lib/lp/code/browser/branch.py	2010-09-22 18:54:36 +0000
4383
+++ lib/lp/code/browser/branch.py	2010-10-04 22:08:24 +0000
4384
@@ -105,6 +105,7 @@
4385
105
from canonical.widgets.branch import TargetBranchWidget
105
from canonical.widgets.branch import TargetBranchWidget
4386
106
from canonical.widgets.itemswidgets import LaunchpadRadioWidgetWithDescription
106
from canonical.widgets.itemswidgets import LaunchpadRadioWidgetWithDescription
4387
107
from canonical.widgets.lazrjs import vocabulary_to_choice_edit_items
107
from canonical.widgets.lazrjs import vocabulary_to_choice_edit_items
4388
108
from lp.app.errors import NotFoundError
4389
108
from lp.blueprints.interfaces.specificationbranch import ISpecificationBranch
109
from lp.blueprints.interfaces.specificationbranch import ISpecificationBranch
4390
109
from lp.bugs.interfaces.bug import IBugSet
110
from lp.bugs.interfaces.bug import IBugSet
4391
110
from lp.bugs.interfaces.bugbranch import IBugBranch
111
from lp.bugs.interfaces.bugbranch import IBugBranch
4392
@@ -146,6 +147,9 @@
4393
146
from lp.registry.interfaces.productseries import IProductSeries
147
from lp.registry.interfaces.productseries import IProductSeries
4394
147
from lp.registry.vocabularies import UserTeamsParticipationPlusSelfVocabulary
148
from lp.registry.vocabularies import UserTeamsParticipationPlusSelfVocabulary
4395
148
from lp.services.propertycache import cachedproperty
149
from lp.services.propertycache import cachedproperty
4396
150
from lp.translations.interfaces.translationtemplatesbuild import (
4397
151
    ITranslationTemplatesBuildSource,
4398
152
    )
4399
149
153
4400
150
154
4401
151
def quote(text):
155
def quote(text):
4402
@@ -238,6 +242,16 @@
4403
238
        """Traverses to the `ICodeImport` for the branch."""
242
        """Traverses to the `ICodeImport` for the branch."""
4404
239
        return self.context.code_import
243
        return self.context.code_import
4405
240
244
4406
245
    @stepthrough("+translation-templates-build")
4407
246
    def traverse_translation_templates_build(self, id_string):
4408
247
        """Traverses to a `TranslationTemplatesBuild`."""
4409
248
        try:
4410
249
            buildfarmjob_id = int(id_string)
4411
250
        except ValueError:
4412
251
            raise NotFoundError(id_string)
4413
252
        source = getUtility(ITranslationTemplatesBuildSource)
4414
253
        return source.getByBuildFarmJob(buildfarmjob_id)
4415
254
4416
241
255
4417
242
class BranchEditMenu(NavigationMenu):
256
class BranchEditMenu(NavigationMenu):
4418
243
    """Edit menu for IBranch."""
257
    """Edit menu for IBranch."""
4419
244
258
4420
=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
4421
--- lib/lp/code/browser/branchmergeproposal.py	2010-09-27 20:47:58 +0000
4422
+++ lib/lp/code/browser/branchmergeproposal.py	2010-10-04 22:08:24 +0000
4423
@@ -547,7 +547,7 @@
4424
547
        return diff_text.count('\n') >= config.diff.max_format_lines
547
        return diff_text.count('\n') >= config.diff.max_format_lines
4425
548
548
4426
549
549
4428
550
class ICodeReviewNewRevisions(Interface):
550
class ICodeReviewNewRevisions(IComment):
4429
551
    """Marker interface used to register views for CodeReviewNewRevisions."""
551
    """Marker interface used to register views for CodeReviewNewRevisions."""
4430
552
552
4431
553
553
4432
@@ -557,7 +557,7 @@
4433
557
    Each object instance represents a number of revisions scanned at a
557
    Each object instance represents a number of revisions scanned at a
4434
558
    particular time.
558
    particular time.
4435
559
    """
559
    """
4437
560
    implements(IComment, ICodeReviewNewRevisions)
560
    implements(ICodeReviewNewRevisions)
4438
561
561
4439
562
    def __init__(self, revisions, date, branch):
562
    def __init__(self, revisions, date, branch):
4440
563
        self.revisions = revisions
563
        self.revisions = revisions
4441
@@ -567,6 +567,13 @@
4442
567
        # The date attribute is used to sort the comments in the conversation.
567
        # The date attribute is used to sort the comments in the conversation.
4443
568
        self.date = date
568
        self.date = date
4444
569
569
4445
570
        # Other standard IComment attributes are not used.
4446
571
        self.extra_css_class = None
4447
572
        self.comment_author = None
4448
573
        self.body_text = None
4449
574
        self.comment_date = None
4450
575
        self.display_attachments = False
4451
576
4452
570
577
4453
571
class CodeReviewNewRevisionsView(LaunchpadView):
578
class CodeReviewNewRevisionsView(LaunchpadView):
4454
572
    """The view for rendering the new revisions."""
579
    """The view for rendering the new revisions."""
4455
573
580
4456
=== modified file 'lib/lp/code/browser/codereviewcomment.py'
4457
--- lib/lp/code/browser/codereviewcomment.py	2010-10-01 14:14:04 +0000
4458
+++ lib/lp/code/browser/codereviewcomment.py	2010-10-04 22:08:24 +0000
4459
@@ -43,6 +43,10 @@
4460
43
from lp.services.propertycache import cachedproperty
43
from lp.services.propertycache import cachedproperty
4461
44
44
4462
45
45
4463
46
class ICodeReviewDisplayComment(IComment, ICodeReviewComment):
4464
47
    """Marker interface for displaying code review comments."""
4465
48
4466
49
4467
46
class CodeReviewDisplayComment:
50
class CodeReviewDisplayComment:
4468
47
    """A code review comment or activity or both.
51
    """A code review comment or activity or both.
4469
48
52
4470
@@ -51,7 +55,7 @@
4471
51
    only code in the model itself.
55
    only code in the model itself.
4472
52
    """
56
    """
4473
53
57
4475
54
    implements(IComment)
58
    implements(ICodeReviewDisplayComment)
4476
55
59
4477
56
    delegates(ICodeReviewComment, 'comment')
60
    delegates(ICodeReviewComment, 'comment')
4478
57
61
4479
@@ -70,6 +74,40 @@
4480
70
        else:
74
        else:
4481
71
            return ''
75
            return ''
4482
72
76
4483
77
    @cachedproperty
4484
78
    def comment_author(self):
4485
79
        """The author of the comment."""
4486
80
        return self.comment.message.owner
4487
81
4488
82
    @cachedproperty
4489
83
    def has_body(self):
4490
84
        """Is there body text?"""
4491
85
        return bool(self.body_text)
4492
86
4493
87
    @cachedproperty
4494
88
    def body_text(self):
4495
89
        """Get the body text for the message."""
4496
90
        return self.comment.message_body
4497
91
4498
92
    @cachedproperty
4499
93
    def comment_date(self):
4500
94
        """The date of the comment."""
4501
95
        return self.comment.message.datecreated
4502
96
4503
97
    @cachedproperty
4504
98
    def all_attachments(self):
4505
99
        return self.comment.getAttachments()
4506
100
4507
101
    @cachedproperty
4508
102
    def display_attachments(self):
4509
103
        # Attachments to show.
4510
104
        return [DiffAttachment(alias) for alias in self.all_attachments[0]]
4511
105
4512
106
    @cachedproperty
4513
107
    def other_attachments(self):
4514
108
        # Attachments to not show.
4515
109
        return self.all_attachments[1]
4516
110
4517
73
111
4518
74
class CodeReviewCommentPrimaryContext:
112
class CodeReviewCommentPrimaryContext:
4519
75
    """The primary context is the comment is that of the source branch."""
113
    """The primary context is the comment is that of the source branch."""
4520
@@ -132,45 +170,11 @@
4521
132
        """The decorated code review comment."""
170
        """The decorated code review comment."""
4522
133
        return CodeReviewDisplayComment(self.context)
171
        return CodeReviewDisplayComment(self.context)
4523
134
172
4524
135
    @cachedproperty
4525
136
    def comment_author(self):
4526
137
        """The author of the comment."""
4527
138
        return self.context.message.owner
4528
139
4529
140
    @cachedproperty
4530
141
    def has_body(self):
4531
142
        """Is there body text?"""
4532
143
        return bool(self.body_text)
4533
144
4534
145
    @cachedproperty
4535
146
    def body_text(self):
4536
147
        """Get the body text for the message."""
4537
148
        return self.context.message_body
4538
149
4539
150
    @cachedproperty
4540
151
    def comment_date(self):
4541
152
        """The date of the comment."""
4542
153
        return self.context.message.datecreated
4543
154
4544
155
    # Should the comment be shown in full?
173
    # Should the comment be shown in full?
4545
156
    full_comment = True
174
    full_comment = True
4546
157
    # Show comment expanders?
175
    # Show comment expanders?
4547
158
    show_expanders = False
176
    show_expanders = False
4548
159
177
4549
160
    @cachedproperty
4550
161
    def all_attachments(self):
4551
162
        return self.context.getAttachments()
4552
163
4553
164
    @cachedproperty
4554
165
    def display_attachments(self):
4555
166
        # Attachments to show.
4556
167
        return [DiffAttachment(alias) for alias in self.all_attachments[0]]
4557
168
4558
169
    @cachedproperty
4559
170
    def other_attachments(self):
4560
171
        # Attachments to not show.
4561
172
        return self.all_attachments[1]
4562
173
4563
174
178
4564
175
class CodeReviewCommentSummary(CodeReviewCommentView):
179
class CodeReviewCommentSummary(CodeReviewCommentView):
4565
176
    """Summary view of a CodeReviewComment"""
180
    """Summary view of a CodeReviewComment"""
4566
177
181
4567
=== modified file 'lib/lp/code/browser/configure.zcml'
4568
--- lib/lp/code/browser/configure.zcml	2010-09-30 22:26:08 +0000
4569
+++ lib/lp/code/browser/configure.zcml	2010-10-04 22:08:24 +0000
4570
@@ -691,6 +691,16 @@
4571
691
            name="+index"
691
            name="+index"
4572
692
            template="../templates/codereviewcomment-index.pt"/>
692
            template="../templates/codereviewcomment-index.pt"/>
4573
693
        <browser:page
693
        <browser:page
4574
694
            name="+fragment"
4575
695
            template="../templates/codereviewcomment-fragment.pt"/>
4576
696
    </browser:pages>
4577
697
    <browser:pages
4578
698
        facet="branches"
4579
699
        for="lp.code.browser.codereviewcomment.ICodeReviewDisplayComment"
4580
700
        layer="lp.code.publisher.CodeLayer"
4581
701
        class="lp.code.browser.codereviewcomment.CodeReviewCommentView"
4582
702
        permission="zope.Public">
4583
703
        <browser:page
4584
694
            name="+comment-header"
704
            name="+comment-header"
4585
695
            template="../templates/codereviewcomment-header.pt"/>
705
            template="../templates/codereviewcomment-header.pt"/>
4586
696
        <browser:page
706
        <browser:page
4587
@@ -699,9 +709,6 @@
4588
699
        <browser:page
709
        <browser:page
4589
700
            name="+comment-footer"
710
            name="+comment-footer"
4590
701
            template="../templates/codereviewcomment-footer.pt"/>
711
            template="../templates/codereviewcomment-footer.pt"/>
4591
702
        <browser:page
4592
703
            name="+fragment"
4593
704
            template="../templates/codereviewcomment-fragment.pt"/>
4594
705
    </browser:pages>
712
    </browser:pages>
4595
706
    <browser:pages
713
    <browser:pages
4596
707
        facet="branches"
714
        facet="branches"
4597
708
715
4598
=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
4599
--- lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-09-15 20:41:46 +0000
4600
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-10-04 22:08:24 +0000
4601
@@ -23,6 +23,7 @@
4602
23
from canonical.launchpad.database.message import MessageSet
23
from canonical.launchpad.database.message import MessageSet
4603
24
from canonical.launchpad.webapp.interfaces import IPrimaryContext
24
from canonical.launchpad.webapp.interfaces import IPrimaryContext
4604
25
from canonical.launchpad.webapp.servers import LaunchpadTestRequest
25
from canonical.launchpad.webapp.servers import LaunchpadTestRequest
4605
26
from canonical.launchpad.webapp.testing import verifyObject
4606
26
from canonical.testing import (
27
from canonical.testing import (
4607
27
    DatabaseFunctionalLayer,
28
    DatabaseFunctionalLayer,
4608
28
    LaunchpadFunctionalLayer,
29
    LaunchpadFunctionalLayer,
4609
@@ -35,8 +36,10 @@
4610
35
    BranchMergeProposalMergedView,
36
    BranchMergeProposalMergedView,
4611
36
    BranchMergeProposalVoteView,
37
    BranchMergeProposalVoteView,
4612
37
    DecoratedCodeReviewVoteReference,
38
    DecoratedCodeReviewVoteReference,
4613
39
    ICodeReviewNewRevisions,
4614
38
    latest_proposals_for_each_branch,
40
    latest_proposals_for_each_branch,
4615
39
    )
41
    )
4616
42
from lp.code.browser.codereviewcomment import CodeReviewDisplayComment
4617
40
from lp.code.enums import (
43
from lp.code.enums import (
4618
41
    BranchMergeProposalStatus,
44
    BranchMergeProposalStatus,
4619
42
    CodeReviewVote,
45
    CodeReviewVote,
4620
@@ -45,6 +48,7 @@
4621
45
    PreviewDiff,
48
    PreviewDiff,
4622
46
    StaticDiff,
49
    StaticDiff,
4623
47
    )
50
    )
4624
51
from lp.code.tests.helpers import add_revision_to_branch
4625
48
from lp.testing import (
52
from lp.testing import (
4626
49
    login_person,
53
    login_person,
4627
50
    TestCaseWithFactory,
54
    TestCaseWithFactory,
4628
@@ -575,6 +579,20 @@
4629
575
        view = create_initialized_view(self.bmp, '+index')
579
        view = create_initialized_view(self.bmp, '+index')
4630
576
        self.assertEqual([], view.linked_bugs)
580
        self.assertEqual([], view.linked_bugs)
4631
577
581
4632
582
    def test_CodeReviewNewRevisions_implements_ICodeReviewNewRevisions(self):
4633
583
        # The browser helper class implements its interface.
4634
584
        review_date = datetime(2009, 9, 10, tzinfo=pytz.UTC)
4635
585
        revision_date = review_date + timedelta(days=1)
4636
586
        bmp = self.factory.makeBranchMergeProposal(
4637
587
            date_created=review_date)
4638
588
        revision = add_revision_to_branch(
4639
589
            self.factory, bmp.source_branch, revision_date)
4640
590
4641
591
        view = create_initialized_view(bmp, '+index')
4642
592
        new_revisions = view.conversation.comments[0]
4643
593
4644
594
        self.assertTrue(verifyObject(ICodeReviewNewRevisions, new_revisions))
4645
595
4646
578
    def test_include_superseded_comments(self):
596
    def test_include_superseded_comments(self):
4647
579
        for x, time in zip(range(3), time_counter()):
597
        for x, time in zip(range(3), time_counter()):
4648
580
            if x != 0:
598
            if x != 0:
4649
@@ -707,7 +725,8 @@
4650
707
            body='testing',
725
            body='testing',
4651
708
            attachments=[('test.diff', 'text/plain', attachment_body)])
726
            attachments=[('test.diff', 'text/plain', attachment_body)])
4652
709
        message = MessageSet().fromEmail(msg.as_string())
727
        message = MessageSet().fromEmail(msg.as_string())
4654
710
        return bmp.createCommentFromMessage(message, None, None, msg)
728
        return CodeReviewDisplayComment(
4655
729
            bmp.createCommentFromMessage(message, None, None, msg))
4656
711
730
4657
712
    def test_nonascii_in_attachment_renders(self):
731
    def test_nonascii_in_attachment_renders(self):
4658
713
        # The view should render without errors.
732
        # The view should render without errors.
4659
@@ -723,7 +742,7 @@
4660
723
        # Need to commit in order to read the diff out of the librarian.
742
        # Need to commit in order to read the diff out of the librarian.
4661
724
        transaction.commit()
743
        transaction.commit()
4662
725
        view = create_initialized_view(comment, '+comment-body')
744
        view = create_initialized_view(comment, '+comment-body')
4664
726
        [diff_attachment] = view.display_attachments
745
        [diff_attachment] = view.comment.display_attachments
4665
727
        self.assertEqual(u'\u2615', diff_attachment.diff_text)
746
        self.assertEqual(u'\u2615', diff_attachment.diff_text)
4666
728
747
4667
729
748
4668
730
749
4669
=== modified file 'lib/lp/code/browser/tests/test_codereviewcomment.py'
4670
--- lib/lp/code/browser/tests/test_codereviewcomment.py	2010-08-20 20:31:18 +0000
4671
+++ lib/lp/code/browser/tests/test_codereviewcomment.py	2010-10-04 22:08:24 +0000
4672
@@ -3,35 +3,52 @@
4673
3
3
4674
4
"""Unit tests for CodeReviewComments."""
4
"""Unit tests for CodeReviewComments."""
4675
5
5
4676
6
from __future__ import with_statement
4677
7
4678
6
__metaclass__ = type
8
__metaclass__ = type
4679
7
9
4680
8
import unittest
10
import unittest
4681
9
11
4682
10
from canonical.launchpad.webapp.interfaces import IPrimaryContext
12
from canonical.launchpad.webapp.interfaces import IPrimaryContext
4683
13
from canonical.launchpad.webapp.testing import verifyObject
4684
11
from canonical.testing import DatabaseFunctionalLayer
14
from canonical.testing import DatabaseFunctionalLayer
4685
15
from lp.code.browser.codereviewcomment import (
4686
16
    CodeReviewDisplayComment,
4687
17
    ICodeReviewDisplayComment,
4688
18
    )
4689
12
from lp.testing import (
19
from lp.testing import (
4691
13
    login_person,
20
    person_logged_in,
4692
14
    TestCaseWithFactory,
21
    TestCaseWithFactory,
4693
15
    )
22
    )
4694
16
23
4695
17
24
4698
18
class TestCodeReviewCommentPrimaryContext(TestCaseWithFactory):
25
class TestCodeReviewComments(TestCaseWithFactory):
4697
19
    # Tests the adaptation of a code review comment into a primary context.
4699
20
26
4700
21
    layer = DatabaseFunctionalLayer
27
    layer = DatabaseFunctionalLayer
4701
22
28
4702
23
    def testPrimaryContext(self):
29
    def testPrimaryContext(self):
4703
30
        # Tests the adaptation of a code review comment into a primary
4704
31
        # context.
4705
24
        # We need a person to make a comment.
32
        # We need a person to make a comment.
4712
25
        commenter = self.factory.makePerson()
33
        with person_logged_in(self.factory.makePerson()):
4713
26
        login_person(commenter)
34
            # The primary context of a code review comment is the same
4714
27
        # The primary context of a code review comment is the same as the
35
            # as the primary context for the branch merge proposal that
4715
28
        # primary context for the branch merge proposal that the comment is
36
            # the comment is for.
4716
29
        # for.
37
            comment = self.factory.makeCodeReviewComment()
4717
30
        comment = self.factory.makeCodeReviewComment()
38
4718
31
        self.assertEqual(
39
        self.assertEqual(
4719
32
            IPrimaryContext(comment).context,
40
            IPrimaryContext(comment).context,
4720
33
            IPrimaryContext(comment.branch_merge_proposal).context)
41
            IPrimaryContext(comment.branch_merge_proposal).context)
4721
34
42
4722
43
    def test_display_comment_provides_icodereviewdisplaycomment(self):
4723
44
        # The CodeReviewDisplayComment class provides IComment.
4724
45
        with person_logged_in(self.factory.makePerson()):
4725
46
            comment = self.factory.makeCodeReviewComment()
4726
47
4727
48
        display_comment = CodeReviewDisplayComment(comment)
4728
49
4729
50
        verifyObject(ICodeReviewDisplayComment, display_comment)
4730
51
4731
35
52
4732
36
def test_suite():
53
def test_suite():
4733
37
    return unittest.TestLoader().loadTestsFromName(__name__)
54
    return unittest.TestLoader().loadTestsFromName(__name__)
4734
38
55
4735
=== modified file 'lib/lp/code/doc/branch.txt'
4736
--- lib/lp/code/doc/branch.txt	2010-10-01 14:14:04 +0000
4737
+++ lib/lp/code/doc/branch.txt	2010-10-04 22:08:24 +0000
4738
@@ -405,6 +405,7 @@
4739
405
    sourcepackagerecipedata.base_branch
405
    sourcepackagerecipedata.base_branch
4740
406
    sourcepackagerecipedatainstruction.branch
406
    sourcepackagerecipedatainstruction.branch
4741
407
    specificationbranch.branch
407
    specificationbranch.branch
4742
408
    translationtemplatesbuild.branch
4743
408
409
4744
409
(Unfortunately, references can form a cycle-- note that
410
(Unfortunately, references can form a cycle-- note that
4745
410
codereviewcomments
411
codereviewcomments
4746
411
412
4747
=== modified file 'lib/lp/code/interfaces/branchrevision.py'
4748
--- lib/lp/code/interfaces/branchrevision.py	2010-09-09 01:04:26 +0000
4749
+++ lib/lp/code/interfaces/branchrevision.py	2010-10-04 22:08:24 +0000
4750
@@ -26,8 +26,6 @@
4751
26
    ancestry of a branch. History revisions have an integer sequence, merged
26
    ancestry of a branch. History revisions have an integer sequence, merged
4752
27
    revisions have sequence set to None.
27
    revisions have sequence set to None.
4753
28
    """
28
    """
4754
29
    id = Int(title=_('The database revision ID'))
4755
30
4756
31
    sequence = Int(
29
    sequence = Int(
4757
32
        title=_("Revision number"), required=True,
30
        title=_("Revision number"), required=True,
4758
33
        description=_("The index of the revision within the branch's history."
31
        description=_("The index of the revision within the branch's history."
4759
34
32
4760
=== modified file 'lib/lp/code/model/branch.py'
4761
--- lib/lp/code/model/branch.py	2010-09-21 02:46:02 +0000
4762
+++ lib/lp/code/model/branch.py	2010-10-04 22:08:24 +0000
4763
@@ -919,7 +919,7 @@
4764
919
    def getScannerData(self):
919
    def getScannerData(self):
4765
920
        """See `IBranch`."""
920
        """See `IBranch`."""
4766
921
        columns = (
921
        columns = (
4768
922
            BranchRevision.id, BranchRevision.sequence, Revision.revision_id)
922
            BranchRevision.sequence, Revision.revision_id)
4769
923
        rows = Store.of(self).using(Revision, BranchRevision).find(
923
        rows = Store.of(self).using(Revision, BranchRevision).find(
4770
924
            columns,
924
            columns,
4771
925
            Revision.id == BranchRevision.revision_id,
925
            Revision.id == BranchRevision.revision_id,
4772
@@ -927,7 +927,7 @@
4773
927
        rows = rows.order_by(BranchRevision.sequence)
927
        rows = rows.order_by(BranchRevision.sequence)
4774
928
        ancestry = set()
928
        ancestry = set()
4775
929
        history = []
929
        history = []
4777
930
        for branch_revision_id, sequence, revision_id in rows:
930
        for sequence, revision_id in rows:
4778
931
            ancestry.add(revision_id)
931
            ancestry.add(revision_id)
4779
932
            if sequence is not None:
932
            if sequence is not None:
4780
933
                history.append(revision_id)
933
                history.append(revision_id)
4781
@@ -1027,10 +1027,14 @@
4782
1027
        """Delete jobs for this branch prior to deleting branch.
1027
        """Delete jobs for this branch prior to deleting branch.
4783
1028
1028
4784
1029
        This deletion includes `BranchJob`s associated with the branch,
1029
        This deletion includes `BranchJob`s associated with the branch,
4786
1030
        as well as `BuildQueue` entries for `TranslationTemplateBuildJob`s.
1030
        as well as `BuildQueue` entries for `TranslationTemplateBuildJob`s
4787
1031
        and `TranslationTemplateBuild`s.
4788
1031
        """
1032
        """
4789
1032
        # Avoid circular imports.
1033
        # Avoid circular imports.
4790
1033
        from lp.code.model.branchjob import BranchJob
1034
        from lp.code.model.branchjob import BranchJob
4791
1035
        from lp.translations.model.translationtemplatesbuild import (
4792
1036
            TranslationTemplatesBuild,
4793
1037
            )
4794
1034
1038
4795
1035
        store = Store.of(self)
1039
        store = Store.of(self)
4796
1036
        affected_jobs = Select(
1040
        affected_jobs = Select(
4797
@@ -1044,6 +1048,10 @@
4798
1044
        # Delete Jobs.  Their BranchJobs cascade along in the database.
1048
        # Delete Jobs.  Their BranchJobs cascade along in the database.
4799
1045
        store.find(Job, Job.id.is_in(affected_jobs)).remove()
1049
        store.find(Job, Job.id.is_in(affected_jobs)).remove()
4800
1046
1050
4801
1051
        store.find(
4802
1052
            TranslationTemplatesBuild,
4803
1053
            TranslationTemplatesBuild.branch == self).remove()
4804
1054
4805
1047
    def destroySelf(self, break_references=False):
1055
    def destroySelf(self, break_references=False):
4806
1048
        """See `IBranch`."""
1056
        """See `IBranch`."""
4807
1049
        from lp.code.interfaces.branchjob import IReclaimBranchSpaceJobSource
1057
        from lp.code.interfaces.branchjob import IReclaimBranchSpaceJobSource
4808
1050
1058
4809
=== modified file 'lib/lp/code/model/branchmergeproposal.py'
4810
--- lib/lp/code/model/branchmergeproposal.py	2010-09-22 18:55:25 +0000
4811
+++ lib/lp/code/model/branchmergeproposal.py	2010-10-04 22:08:24 +0000
4812
@@ -633,7 +633,7 @@
4813
633
            SourceRevision,
633
            SourceRevision,
4814
634
            SourceRevision.branch_id == self.source_branch.id,
634
            SourceRevision.branch_id == self.source_branch.id,
4815
635
            SourceRevision.sequence != None,
635
            SourceRevision.sequence != None,
4817
636
            TargetRevision.id == None)
636
            TargetRevision.branch_id == None)
4818
637
        return result.order_by(Desc(SourceRevision.sequence)).config(limit=10)
637
        return result.order_by(Desc(SourceRevision.sequence)).config(limit=10)
4819
638
638
4820
639
    def createComment(self, owner, subject, content=None, vote=None,
639
    def createComment(self, owner, subject, content=None, vote=None,
4821
640
640
4822
=== modified file 'lib/lp/code/model/branchrevision.py'
4823
--- lib/lp/code/model/branchrevision.py	2010-09-09 01:04:26 +0000
4824
+++ lib/lp/code/model/branchrevision.py	2010-10-04 22:08:24 +0000
4825
@@ -21,8 +21,7 @@
4826
21
class BranchRevision(Storm):
21
class BranchRevision(Storm):
4827
22
    """See `IBranchRevision`."""
22
    """See `IBranchRevision`."""
4828
23
    __storm_table__ = 'BranchRevision'
23
    __storm_table__ = 'BranchRevision'
4831
24
24
    __storm_primary__ = "branch_id", "revision_id"
4830
25
    id = Int(primary=True)
4832
26
25
4833
27
    implements(IBranchRevision)
26
    implements(IBranchRevision)
4834
28
27
4835
29
28
4836
=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
4837
--- lib/lp/code/model/tests/test_branchjob.py	2010-08-20 20:31:18 +0000
4838
+++ lib/lp/code/model/tests/test_branchjob.py	2010-10-04 22:08:24 +0000
4839
@@ -518,9 +518,7 @@
4840
518
            except bzr_errors.NoSuchRevision:
518
            except bzr_errors.NoSuchRevision:
4841
519
                revno = None
519
                revno = None
4842
520
            if existing is not None:
520
            if existing is not None:
4846
521
                branchrevision = IMasterStore(branch).find(
521
                branch.removeBranchRevisions([existing.revision.revision_id])
4844
522
                    BranchRevision, BranchRevision.id == existing.id)
4845
523
                branchrevision.remove()
4847
524
            branch.createBranchRevision(revno, revision)
522
            branch.createBranchRevision(revno, revision)
4848
525
523
4849
526
    def create3CommitsBranch(self):
524
    def create3CommitsBranch(self):
4850
527
525
4851
=== modified file 'lib/lp/code/templates/codereviewcomment-body.pt'
4852
--- lib/lp/code/templates/codereviewcomment-body.pt	2010-04-16 04:20:43 +0000
4853
+++ lib/lp/code/templates/codereviewcomment-body.pt	2010-10-04 22:08:24 +0000
4854
@@ -3,9 +3,9 @@
4855
3
   xmlns:metal="http://xml.zope.org/namespaces/metal"
3
   xmlns:metal="http://xml.zope.org/namespaces/metal"
4856
4
   omit-tag="">
4
   omit-tag="">
4857
5
5
4859
6
  <tal:message replace="structure view/body_text/fmt:obfuscate-email/fmt:nice_pre" />
6
  <tal:message replace="structure view/comment/body_text/fmt:obfuscate-email/fmt:nice_pre" />
4860
7
7
4862
8
  <tal:good-attachments repeat="attachment view/display_attachments">
8
  <tal:good-attachments repeat="attachment view/comment/display_attachments">
4863
9
    <div class="boardComment attachment">
9
    <div class="boardComment attachment">
4864
10
      <div class="boardCommentDetails filename"><a tal:content="attachment/filename" tal:attributes="href attachment/getURL"/></div>
10
      <div class="boardCommentDetails filename"><a tal:content="attachment/filename" tal:attributes="href attachment/getURL"/></div>
4865
11
      <div class="boardCommentBody attachmentBody" tal:content="structure attachment/diff_text/fmt:diff"/>
11
      <div class="boardCommentBody attachmentBody" tal:content="structure attachment/diff_text/fmt:diff"/>
4866
12
12
4867
=== modified file 'lib/lp/code/templates/codereviewcomment-header.pt'
4868
--- lib/lp/code/templates/codereviewcomment-header.pt	2010-02-18 16:40:09 +0000
4869
+++ lib/lp/code/templates/codereviewcomment-header.pt	2010-10-04 22:08:24 +0000
4870
@@ -3,9 +3,9 @@
4871
3
   xmlns:metal="http://xml.zope.org/namespaces/metal"
3
   xmlns:metal="http://xml.zope.org/namespaces/metal"
4872
4
   omit-tag="">
4
   omit-tag="">
4873
5
5
4877
6
  <tal:author replace="structure view/comment_author/fmt:link:mainsite"/>
6
  <tal:author replace="structure context/comment_author/fmt:link:mainsite"/>
4878
7
  <tal:has-body condition="view/has_body">wrote</tal:has-body>
7
  <tal:has-body condition="context/has_body">wrote</tal:has-body>
4879
8
  <tal:date replace="view/comment_date/fmt:displaydate" />
8
  <tal:date replace="context/comment_date/fmt:displaydate" />
4880
9
  <span tal:condition="context/from_superseded" class="sprite warning-icon"
9
  <span tal:condition="context/from_superseded" class="sprite warning-icon"
4881
10
        style="float: right">Posted in <a
10
        style="float: right">Posted in <a
4882
11
          tal:attributes="href context/branch_merge_proposal/fmt:url">a
11
          tal:attributes="href context/branch_merge_proposal/fmt:url">a
4883
12
12
4884
=== modified file 'lib/lp/codehosting/sshserver/session.py'
4885
--- lib/lp/codehosting/sshserver/session.py	2010-08-20 20:31:18 +0000
4886
+++ lib/lp/codehosting/sshserver/session.py	2010-10-04 22:08:24 +0000
4887
@@ -9,9 +9,20 @@
4888
9
    ]
9
    ]
4889
10
10
4890
11
import os
11
import os
4891
12
import signal
4892
13
import socket
4893
12
import urlparse
14
import urlparse
4894
13
15
4896
14
from twisted.internet.process import ProcessExitedAlready
16
from zope.event import notify
4897
17
from zope.interface import implements
4898
18
4899
19
from twisted.internet import (
4900
20
    error,
4901
21
    fdesc,
4902
22
    interfaces,
4903
23
    main,
4904
24
    process,
4905
25
    )
4906
15
from twisted.python import log
26
from twisted.python import log
4907
16
from zope.event import notify
27
from zope.event import notify
4908
17
28
4909
@@ -35,6 +46,229 @@
4910
35
    """Raised when a session is asked to execute a forbidden command."""
46
    """Raised when a session is asked to execute a forbidden command."""
4911
36
47
4912
37
48
4913
49
class _WaitForExit(process.ProcessReader):
4914
50
    """Wait on a socket for the exit status."""
4915
51
4916
52
    def __init__(self, reactor, proc, sock):
4917
53
        super(_WaitForExit, self).__init__(reactor, proc, 'exit',
4918
54
                                           sock.fileno())
4919
55
        self._sock = sock
4920
56
        self.connected = 1
4921
57
4922
58
    def close(self):
4923
59
        self._sock.close()
4924
60
4925
61
    def dataReceived(self, data):
4926
62
        # TODO: how do we handle getting only *some* of the content?, Maybe we
4927
63
        #       need to read more bytes first...
4928
64
4929
65
        # This is the only thing we do differently from the standard
4930
66
        # ProcessReader. When we get data on this socket, we need to treat it
4931
67
        # as a return code, or a failure.
4932
68
        if not data.startswith('exited'):
4933
69
            # Bad data, we want to signal that we are closing the connection
4934
70
            # TODO: How?
4935
71
            # self.proc.?
4936
72
            self.close()
4937
73
            # I don't know what to put here if we get bogus data, but I *do*
4938
74
            # want to say that the process is now considered dead to me
4939
75
            log.err('Got invalid exit information: %r' % (data,))
4940
76
            exit_status = (255 << 8)
4941
77
        else:
4942
78
            exit_status = int(data.split('\n')[1])
4943
79
        self.proc.processEnded(exit_status)
4944
80
4945
81
4946
82
class ForkedProcessTransport(process.BaseProcess):
4947
83
    """Wrap the forked process in a ProcessTransport so we can talk to it.
4948
84
4949
85
    Note that instantiating the class creates the fork and sets it up in the
4950
86
    reactor.
4951
87
    """
4952
88
4953
89
    implements(interfaces.IProcessTransport)
4954
90
4955
91
    # Design decisions
4956
92
    # [Decision #a]
4957
93
    #   Inherit from process.BaseProcess
4958
94
    #       This seems slightly risky, as process.BaseProcess is actually
4959
95
    #       imported from twisted.internet._baseprocess.BaseProcess. The
4960
96
    #       real-world Process then actually inherits from process._BaseProcess
4961
97
    #       I've also had to copy a fair amount from the actual Process
4962
98
    #       command.
4963
99
    #       One option would be to inherit from process.Process, and just
4964
100
    #       override stuff like __init__ and reapProcess which I don't want to
4965
101
    #       do in the same way. (Is it ok not to call your Base classes
4966
102
    #       __init__ if you don't want to do that exact work?)
4967
103
4968
104
    def __init__(self, reactor, executable, args, environment, proto):
4969
105
        process.BaseProcess.__init__(self, proto)
4970
106
        # Map from standard file descriptor to the associated pipe
4971
107
        self.pipes = {}
4972
108
        pid, path, sock = self._spawn(executable, args, environment)
4973
109
        self._fifo_path = path
4974
110
        self.pid = pid
4975
111
        self.process_sock = sock
4976
112
        self._fifo_path = path
4977
113
        self._connectSpawnToReactor(reactor)
4978
114
        if self.proto is not None:
4979
115
            self.proto.makeConnection(self)
4980
116
4981
117
    def _sendMessageToService(self, message):
4982
118
        """Send a message to the Forking service and get the response"""
4983
119
        path = config.codehosting.forking_daemon_socket
4984
120
        client_sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
4985
121
        log.msg('Connecting to Forking Service @ socket: %s for %r'
4986
122
                % (path, message))
4987
123
        try:
4988
124
            client_sock.connect(path)
4989
125
            client_sock.sendall(message)
4990
126
            # We define the requests to be no bigger than 1kB. (For now)
4991
127
            response = client_sock.recv(1024)
4992
128
        except socket.error, e:
4993
129
            # TODO: What exceptions should be raised?
4994
130
            #       Raising the raw exception seems to kill the twisted reactor
4995
131
            #       Note that if the connection is refused, we *could* just
4996
132
            #       fall back on a regular 'spawnProcess' call.
4997
133
            log.err('Connection failed: %s' % (e,))
4998
134
            raise
4999
135
        if response.startswith("FAILURE"):
5000
136
            raise RuntimeError('Failed to send message: %r' % (response,))
Reviewer	Date Requested	Status
John A Meinel (community)		Needs Resubmitting on 2010-10-04
Andrew Bennetts (community)	2010-09-17	Needs Resubmitting on 2010-09-28
Jonathan Lange	2010-09-17	Pending
Review via email: mp+35877@code.launchpad.net