Chris Lamb [Tue, 27 Oct 2009 20:37:50 +0000 (20:37 +0000)]
Merge branch 'master' of ries.debian.org:/srv/ftp.debian.org/git/dak
* 'master' of ries.debian.org:/srv/ftp.debian.org/git/dak:
let's not reset last_used every time...
old
use the id, not the object
add regex import
clean-suites: Remove trailing whitespace
file -> f
we're already in the changes object
use isinstance
fixup
clean-suites: Fix logic error in during source cleaning
clean-suites: Fix SQLA usage
Fix SQL syntax errors
clean-suites: Use utils.warn for warnings about orphaned files
clean-suites: Add proper logging
daklog: Add username in every log line
Joerg Jaspert [Tue, 27 Oct 2009 14:41:19 +0000 (15:41 +0100)]
Merge commit 'lamby/deb-src-3.0-sqla' into merge
* commit 'lamby/deb-src-3.0-sqla': (29 commits)
Drop lzma support.
Only enable not-"1.0" formats on t-p-u and unstable and experimental.
Reject uploads that contain a native tarball and a diff.
dak heresy
Fix reference to cls.requires.
Add unittest.main() to test_regexes.
Add shebang to regex tests.
Simplify rejecting logic
Avoid if/elif/elif.. with lookup table.
Use loop to check for illegal duplication of file types in .dsc
Use a collections.defaultdict to avoid boilerplate definitions.
Correct grammar when rejecting a package with insufficient files.
Require source formats to have a name and interpolate it when returning msgs
Compare with None using "is", not "=="
Remove has_ prefix inside srcformats.
Don't pass dsc_filename to reject_msgs; prepend it in check_dsc_files.
Move rejection message generation into srcformats
Add regex to match .dsc "Format: lala" value and compile it on creation.
Add SourceFormat class and track definitions with metaclass
Make dbconn.get_suite_src_formats use @session_wrapper.
...
Chris Lamb [Tue, 27 Oct 2009 14:25:37 +0000 (14:25 +0000)]
Merge branch 'master' into deb-src-3.0-sqla
* master:
Use session.commit_or_flush in some more functions.
Attach commit_or_flush to session object to call either .commit() or .flush()
Add doc for session_wrapper.
process-new: Fix BCC and X-Katie handling
Fix various small bugs
Re-enable BXA notifications
queue: Fix typo
Convert process_new to new APIs
Print a warning if a trainee tries to do something he's not allowed to do
Documentation fixes
Joerg Jaspert [Tue, 27 Oct 2009 14:09:16 +0000 (15:09 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Use session.commit_or_flush in some more functions.
Attach commit_or_flush to session object to call either .commit() or .flush()
Add doc for session_wrapper.
Joerg Jaspert [Tue, 27 Oct 2009 10:05:04 +0000 (11:05 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
process-new: Fix BCC and X-Katie handling
Fix various small bugs
Re-enable BXA notifications
queue: Fix typo
Convert process_new to new APIs
Print a warning if a trainee tries to do something he's not allowed to do
Documentation fixes
Chris Lamb [Tue, 27 Oct 2009 09:52:18 +0000 (09:52 +0000)]
Merge branch 'master' into deb-src-3.0-sqla
* master:
fix p-u accepts for binary uploads
Correct logic with detecting default kwarg values vs positional args.
Wrap __doc__ and func_name in @session_wrapper.
Avoid circular import when importing daklib.dbconn first.
Handle arguments with default kwargs in @session_wrapper.
Add missing "utils" import (used in security conditional)
No need to assign to a local now that @session_wrapper does the cleanup
Avoid calling .count(); call .one() and catch the exception.
Fix Archive.__repr__
Factor out most common session handling into decorator.
Joerg Jaspert [Tue, 27 Oct 2009 08:28:50 +0000 (09:28 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Add missing "utils" import (used in security conditional)
No need to assign to a local now that @session_wrapper does the cleanup
Avoid calling .count(); call .one() and catch the exception.
Fix Archive.__repr__
Factor out most common session handling into decorator.
Raphaël Hertzog [Tue, 27 Oct 2009 01:39:53 +0000 (02:39 +0100)]
Add support for multiple orig tarballs
Structure of Upload.pkg is adapted to handle multiple upstream tarballs.
This also means that the .dak format is modified.
Since the .dak format has been modified, improve the object .dak parser
funtion to be able to read both the new and the old format. When
reading the old format, it auto-converts the data to the new structure.
It uses python's type() introspection to know what format is used.
This allows in-place upgrade even when old .dak are still stored
in various queues.
Several other adaptations are also required in other methods of Upload object,
in process-accepted, in autobuild_queue().
Raphaël Hertzog [Tue, 27 Oct 2009 00:25:35 +0000 (01:25 +0100)]
dak check-archive: replace check tar-gz-in-dsc
The check tar-gz-in-dsc is replaced by a more meaningful
test similar to what is done is process-unchecked. The new test
is called files-in-dsc and verifies that the files listed
in Files are correct for the format announced in the Format field.
Raphael Hertzog [Sat, 28 Feb 2009 16:39:31 +0000 (17:39 +0100)]
daklib/regexes.py: updates to support new source files
The regex re_issource is modified to recognize the new compression scheme
supported by the 3.0 source package formats. Also add the
the debian.tar file used by 3.0 (quilt) and 2.0 and the
.orig-component.tar for additional upstream tarballs.
Add a new regex re_is_orig_source to know if a file correspond
to some upstream source tarballs (where the version should not have a
debian revision).
Add new regexes re_source_ext and re_orig_source_ext to match only the
extension of source files. And reuse those in the definition of
re_is_orig_source and re_issource to avoid duplication.
projects / dak.git / log