]>
git.decadent.org.uk Git - dak.git/log
Frank Lichtenheld [Fri, 30 Oct 2009 15:16:40 +0000 (15:16 +0000)]
Merge commit 'private/master' into process-upload
Mike O'Connor [Fri, 30 Oct 2009 14:48:45 +0000 (14:48 +0000)]
switch execute to executemany for insert_content_paths
Joerg Jaspert [Fri, 30 Oct 2009 14:40:08 +0000 (15:40 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
split read and write locks
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 14:38:18 +0000 (15:38 +0100)]
split read and write locks
Signed-off-by: Mike O'Connor <stew@vireo.org>
Joerg Jaspert [Fri, 30 Oct 2009 14:32:17 +0000 (15:32 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master': (23 commits)
'as' is a reserved word in Python 2.6.
Don't shadow 'file' builtin in daklib.queue.
Use 4 spaces for indentation.
Correct code to match documentation of Binary.check_utf8_package
Remove unused 'time' import.
Correct isinstance call; DictType is not an actual type.
dak's "Dict" is a synonym of the 'dict' builtin
Use foo.iteritems() to avoid reentrancy with foo[k].
Don't shadow 'map' builtin in daklib.utils.TemplateSubst
Update comment about our monkeypatching of commands.getstatusoutput.
Remove duplicated 'commands' import.
Don't use deprecated string module.
Remove unused imports from daklib.queue.
Remove shadowing builtins in daklib.queue
Remove daklib's now-unused extension functionality.
Remove shadowing builtins in daklib.dbconn.
Don't shadow 'dir' builtin in daklib.utils.get_changes_files
We don't use re_is_orig_source in daklib.utils anymore.
Don't shadow "dir" builtin.
Fix uid references in DM upload error codepaths.
...
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:28:33 +0000 (14:28 +0000)]
'as' is a reserved word in Python 2.6.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:11:05 +0000 (14:11 +0000)]
Don't shadow 'file' builtin in daklib.queue.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:08:27 +0000 (14:08 +0000)]
Use 4 spaces for indentation.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:07:46 +0000 (14:07 +0000)]
Correct code to match documentation of Binary.check_utf8_package
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:05:47 +0000 (14:05 +0000)]
Remove unused 'time' import.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 14:00:15 +0000 (14:00 +0000)]
Correct isinstance call; DictType is not an actual type.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:56:18 +0000 (13:56 +0000)]
dak's "Dict" is a synonym of the 'dict' builtin
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:52:08 +0000 (13:52 +0000)]
Use foo.iteritems() to avoid reentrancy with foo[k].
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:50:46 +0000 (13:50 +0000)]
Don't shadow 'map' builtin in daklib.utils.TemplateSubst
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:49:48 +0000 (13:49 +0000)]
Update comment about our monkeypatching of commands.getstatusoutput.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:48:03 +0000 (13:48 +0000)]
Remove duplicated 'commands' import.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:47:46 +0000 (13:47 +0000)]
Don't use deprecated string module.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:25:26 +0000 (13:25 +0000)]
Remove unused imports from daklib.queue.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:24:48 +0000 (13:24 +0000)]
Remove shadowing builtins in daklib.queue
Chris Lamb [Fri, 30 Oct 2009 13:20:27 +0000 (13:20 +0000)]
Remove daklib's now-unused extension functionality.
Was only used for ACL-like purposes which was re-implemented.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:18:15 +0000 (13:18 +0000)]
Remove shadowing builtins in daklib.dbconn.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:15:57 +0000 (13:15 +0000)]
Don't shadow 'dir' builtin in daklib.utils.get_changes_files
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:15:07 +0000 (13:15 +0000)]
We don't use re_is_orig_source in daklib.utils anymore.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:13:48 +0000 (13:13 +0000)]
Don't shadow "dir" builtin.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:12:33 +0000 (13:12 +0000)]
Fix uid references in DM upload error codepaths.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:11:05 +0000 (13:11 +0000)]
Fix component references in upload component error codepaths.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 13:07:37 +0000 (13:07 +0000)]
Fix handling of invalid Maintainer field.
Signed-off-by: Chris Lamb <lamby@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 14:28:31 +0000 (15:28 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
try to get rid of deadlock
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 14:13:43 +0000 (14:13 +0000)]
process-upload: import action() from process-unchecked
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 14:27:41 +0000 (15:27 +0100)]
try to get rid of deadlock
Signed-off-by: Mike O'Connor <stew@vireo.org>
Mark Hymers [Fri, 30 Oct 2009 14:23:10 +0000 (14:23 +0000)]
sort out type problem
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 14:14:49 +0000 (15:14 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
towpdown import_known_changes
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 14:13:59 +0000 (15:13 +0100)]
towpdown import_known_changes
Signed-off-by: Mike O'Connor <stew@vireo.org>
Frank Lichtenheld [Fri, 30 Oct 2009 14:12:14 +0000 (14:12 +0000)]
queue_install: Adapt to new code organisation
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 14:00:22 +0000 (15:00 +0100)]
Merge commit 'mhy/suitesql' into merge
* commit 'mhy/suitesql':
never change things at the last minute...
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Fri, 30 Oct 2009 14:00:01 +0000 (14:00 +0000)]
never change things at the last minute...
Signed-off-by: Mark Hymers <mhy@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 13:58:08 +0000 (13:58 +0000)]
Copy parts of process-unchecked to daklib.queue_install
To not bloat the new process-upload script unnecessarily
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 13:55:05 +0000 (14:55 +0100)]
Merge commit 'mhy/suitesql' into merge
* commit 'mhy/suitesql':
fix up policy_queue support in the ORM and drop old column
add support for policy queues to the database
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Fri, 30 Oct 2009 13:51:45 +0000 (13:51 +0000)]
Merge commit 'ftpmaster/master' into suitesql
Mark Hymers [Fri, 30 Oct 2009 13:49:38 +0000 (13:49 +0000)]
fix up policy_queue support in the ORM and drop old column
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 13:48:38 +0000 (14:48 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
I LOVE WHITESPACE
i was trying to interrupt this with the keyboards and failing
get rid of log msgs
import known_changes with correct name. catch keybord exception
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 13:47:07 +0000 (14:47 +0100)]
I LOVE WHITESPACE
Mark Hymers [Fri, 30 Oct 2009 13:46:10 +0000 (13:46 +0000)]
add support for policy queues to the database
Signed-off-by: Mark Hymers <mhy@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 13:36:52 +0000 (13:36 +0000)]
i was trying to interrupt this with the keyboards and failing
Joerg Jaspert [Fri, 30 Oct 2009 13:22:03 +0000 (14:22 +0100)]
Add an inline signed release file
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 13:17:20 +0000 (13:17 +0000)]
process-upload: clean up process_it()
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 13:10:10 +0000 (14:10 +0100)]
epydoc header
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 13:07:24 +0000 (13:07 +0000)]
process-upload: import process_it() from process-unchecked
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 12:49:39 +0000 (12:49 +0000)]
process-upload: reorganise option parsing
Give more helpful error messages and log where we did get
the changes files from.
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 12:03:07 +0000 (12:03 +0000)]
Merge commit 'public/knownchanges' into knownchanges
Mike O'Connor [Fri, 30 Oct 2009 12:02:58 +0000 (12:02 +0000)]
get rid of log msgs
Mike O'Connor [Fri, 30 Oct 2009 12:00:51 +0000 (13:00 +0100)]
import known_changes with correct name. catch keybord exception
Signed-off-by: Mike O'Connor <stew@vireo.org>
Joerg Jaspert [Fri, 30 Oct 2009 12:00:04 +0000 (13:00 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Remove duplicate return statement.
Add missing Config initialiser.
Fix do_anaias in cruft-report.
Add missing import in contents
Add missing configuration initialiser.
Fix check_indices_files_exist in check-archive.
Fix local variable in check-archive/check_override
Fix check_override in check-archive.
Don't shadow built-in 'file'
Consistently use 4-spaces in add_user.py
Don't mix tabs and spaces in add_user.py
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:56:43 +0000 (11:56 +0000)]
Remove duplicate return statement.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:54:33 +0000 (11:54 +0000)]
Add missing Config initialiser.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:53:33 +0000 (11:53 +0000)]
Fix do_anaias in cruft-report.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:49:21 +0000 (11:49 +0000)]
Add missing import in contents
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:48:26 +0000 (11:48 +0000)]
Add missing configuration initialiser.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:48:04 +0000 (11:48 +0000)]
Fix check_indices_files_exist in check-archive.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:45:56 +0000 (11:45 +0000)]
Fix local variable in check-archive/check_override
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:45:08 +0000 (11:45 +0000)]
Fix check_override in check-archive.
Signed-off-by: Chris Lamb <lamby@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 11:42:34 +0000 (11:42 +0000)]
process-upload: Change logging behaviour for --no-action
Log to stderr instead if not at all.
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:41:21 +0000 (11:41 +0000)]
Don't shadow built-in 'file'
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:40:23 +0000 (11:40 +0000)]
Consistently use 4-spaces in add_user.py
Signed-off-by: Chris Lamb <lamby@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:38:40 +0000 (12:38 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
now actuall working
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 11:37:50 +0000 (12:37 +0100)]
merge from flotow
Signed-off-by: Mike O'Connor <stew@vireo.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:33:51 +0000 (12:33 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
importing old changes files into knwon_changes with a separeate script, now allowing some fields to be 'missing'
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:33:42 +0000 (11:33 +0000)]
Don't mix tabs and spaces in add_user.py
Frank Lichtenheld [Fri, 30 Oct 2009 11:30:29 +0000 (11:30 +0000)]
Merge commit 'private/master' into process-upload
Mike O'Connor [Fri, 30 Oct 2009 11:29:17 +0000 (12:29 +0100)]
Merge remote branch 'origin/master' into knownchanges
Mike O'Connor [Fri, 30 Oct 2009 11:28:09 +0000 (11:28 +0000)]
now actuall working
Frank Lichtenheld [Fri, 30 Oct 2009 11:27:46 +0000 (11:27 +0000)]
process-upload: Add standard boilerplate code
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:19:01 +0000 (12:19 +0100)]
Merge branch 'merge'
* merge:
Revert "remove an unneeded linewrap" - not needed anymore.
Strip trailing newline, just like getstatusoutput
Mark Hymers [Fri, 30 Oct 2009 11:18:42 +0000 (11:18 +0000)]
Merge commit 'origin/master'
Joerg Jaspert [Fri, 30 Oct 2009 11:18:32 +0000 (12:18 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Revert "remove an unneeded linewrap" - not needed anymore.
Strip trailing newline, just like getstatusoutput
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Fri, 30 Oct 2009 11:17:41 +0000 (11:17 +0000)]
convert to using the debversion C type
Signed-off-by: Mark Hymers <mhy@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:13:33 +0000 (11:13 +0000)]
Revert "remove an unneeded linewrap" - not needed anymore.
This reverts commit
fa8582a41855d39d864495f1bc0b28805d992ad1 .
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Fri, 30 Oct 2009 11:16:51 +0000 (11:16 +0000)]
Strip trailing newline, just like getstatusoutput
Signed-off-by: Chris Lamb <lamby@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:11:51 +0000 (12:11 +0100)]
add missing s
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:09:18 +0000 (12:09 +0100)]
remove an unneeded linewrap
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 11:01:15 +0000 (12:01 +0100)]
Misses summary
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 10:59:36 +0000 (11:59 +0100)]
Add suites to bug close mails from rm
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 10:54:11 +0000 (11:54 +0100)]
importing old changes files into knwon_changes with a separeate script, now allowing some fields to be 'missing'
Joerg Jaspert [Fri, 30 Oct 2009 10:48:37 +0000 (11:48 +0100)]
dak rm
also print the bug closing reason within the bug close mail
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Frank Lichtenheld [Fri, 30 Oct 2009 09:14:09 +0000 (10:14 +0100)]
Document the current workings of p-u and p-a
So that we can find a way to merge them in one script.
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 10:31:06 +0000 (11:31 +0100)]
you are named p-u, not dinstall
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 10:28:37 +0000 (11:28 +0100)]
template
modify our contents template
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:36:11 +0000 (10:36 +0100)]
Oh well
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:31:48 +0000 (10:31 +0100)]
And now this is clearly pythons fault. Ruby would have broken earlier! :)
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:29:34 +0000 (10:29 +0100)]
And how about we make this mhy fault?
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:28:29 +0000 (10:28 +0100)]
And that is probaby Linux (hello git) fault :)
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:27:06 +0000 (10:27 +0100)]
And that is probably (not) ganneffs fault
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:25:15 +0000 (10:25 +0100)]
Its (not) probably all stews fault
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:23:25 +0000 (10:23 +0100)]
knwonchnges
do not import subdirs for now.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:21:39 +0000 (10:21 +0100)]
Merge commit 'stew/knownchanges' into merge
* commit 'stew/knownchanges':
trailing whitespace, update to 18 not 20
update20 -> update 18
removing known_changes now works, and inserting has a better chance of working
update20 is closer to tested
check for a DAK_CONFIG env variable when looking for dak.conf
moved inserts of known_changes to Changes() class. add insert known_changes in p-u, remove known_changes in process_new.reject
Start the known_changes table
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 09:16:36 +0000 (10:16 +0100)]
trailing whitespace, update to 18 not 20
Signed-off-by: Mike O'Connor <stew@vireo.org>
Mike O'Connor [Fri, 30 Oct 2009 09:13:44 +0000 (10:13 +0100)]
merge with ftp-master
Signed-off-by: Mike O'Connor <stew@vireo.org>
Mike O'Connor [Fri, 30 Oct 2009 09:12:23 +0000 (10:12 +0100)]
update20 -> update 18
Signed-off-by: Mike O'Connor <stew@vireo.org>
Joerg Jaspert [Fri, 30 Oct 2009 09:10:17 +0000 (10:10 +0100)]
Merge commit 'stew/contents' into merge
* commit 'stew/contents':
bootstrap_bin working
merge from master with sqla
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mike O'Connor [Fri, 30 Oct 2009 09:08:39 +0000 (09:08 +0000)]
minor fixes