]>
git.decadent.org.uk Git - dak.git/log
Chris Lamb [Tue, 27 Oct 2009 14:40:49 +0000 (14:40 +0000)]
Drop lzma support.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 14:40:15 +0000 (14:40 +0000)]
Only enable not-"1.0" formats on t-p-u and unstable and experimental.
Signed-off-by: Chris Lamb <lamby@debian.org>
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
Conflicts:
daklib/queue.py
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.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Tue, 27 Oct 2009 09:19:24 +0000 (09:19 +0000)]
Use session.commit_or_flush in some more functions.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 09:19:00 +0000 (09:19 +0000)]
Attach commit_or_flush to session object to call either .commit() or .flush()
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:55:06 +0000 (08:55 +0000)]
Add doc for session_wrapper.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 13:30:29 +0000 (13:30 +0000)]
Reject uploads that contain a native tarball and a diff.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 13:29:51 +0000 (13:29 +0000)]
dak heresy
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 13:06:15 +0000 (13:06 +0000)]
Fix reference to cls.requires.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 13:00:50 +0000 (13:00 +0000)]
Add unittest.main() to test_regexes.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 11:57:56 +0000 (11:57 +0000)]
Add shebang to regex tests.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 11:51:40 +0000 (11:51 +0000)]
Simplify rejecting logic
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 11:11:05 +0000 (11:11 +0000)]
Avoid if/elif/elif.. with lookup table.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:56:45 +0000 (10:56 +0000)]
Use loop to check for illegal duplication of file types in .dsc
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:52:33 +0000 (10:52 +0000)]
Use a collections.defaultdict to avoid boilerplate definitions.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:41:14 +0000 (10:41 +0000)]
Correct grammar when rejecting a package with insufficient files.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:40:10 +0000 (10:40 +0000)]
Require source formats to have a name and interpolate it when returning msgs
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:36:26 +0000 (10:36 +0000)]
Compare with None using "is", not "=="
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:35:22 +0000 (10:35 +0000)]
Remove has_ prefix inside srcformats.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:33:40 +0000 (10:33 +0000)]
Don't pass dsc_filename to reject_msgs; prepend it in check_dsc_files.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:31:22 +0000 (10:31 +0000)]
Move rejection message generation into srcformats
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:28:59 +0000 (10:28 +0000)]
Add regex to match .dsc "Format: lala" value and compile it on creation.
This forces every format to have a regex too as it will blow up otherwise.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 10:25:59 +0000 (10:25 +0000)]
Add SourceFormat class and track definitions with metaclass
Signed-off-by: Chris Lamb <lamby@debian.org>
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
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Tue, 27 Oct 2009 10:04:35 +0000 (10:04 +0000)]
Merge commit 'djpig/djpig'
Conflicts:
daklib/dbconn.py
Signed-off-by: Mark Hymers <mhy@debian.org>
Frank Lichtenheld [Tue, 27 Oct 2009 09:57:05 +0000 (09:57 +0000)]
process-new: Fix BCC and X-Katie handling
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Frank Lichtenheld [Tue, 27 Oct 2009 09:56:06 +0000 (09:56 +0000)]
Fix various small bugs
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Chris Lamb [Tue, 27 Oct 2009 09:49:00 +0000 (09:49 +0000)]
Make dbconn.get_suite_src_formats use @session_wrapper.
Signed-off-by: Chris Lamb <lamby@debian.org>
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 09:05:51 +0000 (10:05 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
fix p-u accepts for binary uploads
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Tue, 27 Oct 2009 09:04:57 +0000 (09:04 +0000)]
fix p-u accepts for binary uploads
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Tue, 27 Oct 2009 08:49:04 +0000 (09:49 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Correct logic with detecting default kwarg values vs positional args.
Wrap __doc__ and func_name in @session_wrapper.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:47:48 +0000 (08:47 +0000)]
Correct logic with detecting default kwarg values vs positional args.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:40:04 +0000 (08:40 +0000)]
Wrap __doc__ and func_name in @session_wrapper.
Signed-off-by: Chris Lamb <lamby@debian.org>
Joerg Jaspert [Tue, 27 Oct 2009 08:36:02 +0000 (09:36 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Avoid circular import when importing daklib.dbconn first.
Handle arguments with default kwargs in @session_wrapper.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:35:14 +0000 (08:35 +0000)]
Avoid circular import when importing daklib.dbconn first.
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:34:25 +0000 (08:34 +0000)]
Handle arguments with default kwargs in @session_wrapper.
Signed-off-by: Chris Lamb <lamby@debian.org>
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.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Tue, 27 Oct 2009 08:18:57 +0000 (08:18 +0000)]
Add missing "utils" import (used in security conditional)
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Mon, 26 Oct 2009 20:02:09 +0000 (20:02 +0000)]
No need to assign to a local now that @session_wrapper does the cleanup
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Mon, 26 Oct 2009 19:48:14 +0000 (19:48 +0000)]
Avoid calling .count(); call .one() and catch the exception.
Signed-off-by: Chris Lamb <lamby@debian.org>
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().
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
Raphaël Hertzog [Tue, 27 Oct 2009 00:29:52 +0000 (01:29 +0100)]
dak show-new: use new regex to cope with all source files extensions
Signed-off-by: Raphael Hertzog <hertzog@debian.org>
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.
Signed-off-by: Raphael Hertzog <hertzog@debian.org>
Raphaël Hertzog [Tue, 27 Oct 2009 00:12:06 +0000 (01:12 +0100)]
Fix Upload.check_files() and Upload.check_dsc() to support new formats
Also fix queue.get_type() to handle all source files extensions.
Raphael Hertzog [Sat, 28 Feb 2009 22:38:34 +0000 (23:38 +0100)]
Fix utils.build_file_list() for 3.x source packages
Let utils.build_file_list() know that we understand newer
formats like 3.0 (quilt) or 3.0 (native).
Signed-off-by: Raphael Hertzog <hertzog@debian.org>
Raphaël Hertzog [Mon, 26 Oct 2009 22:58:01 +0000 (23:58 +0100)]
Create utils.check_dsc() to verify files in source packages
It ensures that the right files are there for each source format.
This will be used by at several places (daklib/queue.py,
dak/check-archive.py).
Signed-off-by: Raphael Hertzog <hertzog@debian.org>
Raphaël Hertzog [Mon, 26 Oct 2009 23:35:18 +0000 (00:35 +0100)]
Add new SQLAlchemy objects representing source formats
Also add a function get_suite_src_formats(suite) returning the list of
allowed formats for a given suite.
Raphaël Hertzog [Mon, 26 Oct 2009 23:08:07 +0000 (00:08 +0100)]
Add list of allowed source formats in the database
* Add dak/dakdb/update15.py to update the database.
* Update required_database_schema to 15 in dak/update_db.py.
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.
Signed-off-by: Raphael Hertzog <hertzog@debian.org>
Frank Lichtenheld [Mon, 26 Oct 2009 19:43:22 +0000 (19:43 +0000)]
Re-enable BXA notifications
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Frank Lichtenheld [Mon, 26 Oct 2009 19:42:33 +0000 (19:42 +0000)]
queue: Fix typo
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Chris Lamb [Mon, 26 Oct 2009 19:27:09 +0000 (19:27 +0000)]
Fix Archive.__repr__
Signed-off-by: Chris Lamb <lamby@debian.org>
Chris Lamb [Mon, 26 Oct 2009 19:25:33 +0000 (19:25 +0000)]
Factor out most common session handling into decorator.
Signed-off-by: Chris Lamb <lamby@debian.org>
Frank Lichtenheld [Mon, 26 Oct 2009 19:19:27 +0000 (19:19 +0000)]
Convert process_new to new APIs
All code only used in security and/or stable updates is commented
out for now and not converted, yet
Frank Lichtenheld [Mon, 26 Oct 2009 19:16:43 +0000 (19:16 +0000)]
Print a warning if a trainee tries to do something he's not allowed to do
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Frank Lichtenheld [Mon, 26 Oct 2009 13:50:32 +0000 (13:50 +0000)]
Documentation fixes
Signed-off-by: Frank Lichtenheld <djpig@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 19:11:03 +0000 (20:11 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
really disable contents in p-a
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 19:10:50 +0000 (19:10 +0000)]
really disable contents in p-a
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 19:06:06 +0000 (20:06 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
disable contents storage for now
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 19:05:43 +0000 (19:05 +0000)]
disable contents storage for now
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:21:07 +0000 (19:21 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
Dear Ganneff, C+P coding is not helpful
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:20:43 +0000 (18:20 +0000)]
Dear Ganneff, C+P coding is not helpful
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:18:46 +0000 (19:18 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
try fixing up this *again*
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:17:04 +0000 (19:17 +0100)]
For now do not say queue only but let it deliver instantly
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:15:21 +0000 (18:15 +0000)]
try fixing up this *again*
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:10:03 +0000 (19:10 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
why do people want readable messages?
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:09:50 +0000 (18:09 +0000)]
why do people want readable messages?
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:07:32 +0000 (19:07 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
urgh, wrong part of the message
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:06:46 +0000 (18:06 +0000)]
urgh, wrong part of the message
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:03:33 +0000 (19:03 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
tidy up messages
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:03:10 +0000 (18:03 +0000)]
tidy up messages
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 18:00:49 +0000 (19:00 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
package -> source
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 18:00:37 +0000 (18:00 +0000)]
package -> source
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 17:59:32 +0000 (18:59 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
show the package name, not the object repr
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 17:59:15 +0000 (17:59 +0000)]
show the package name, not the object repr
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 17:57:47 +0000 (18:57 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
we now get an object or None back not a list...
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 17:56:42 +0000 (17:56 +0000)]
we now get an object or None back not a list...
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 17:54:00 +0000 (18:54 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
use correct function name
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 17:46:55 +0000 (17:46 +0000)]
use correct function name
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 16:55:22 +0000 (17:55 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
initialise template variables
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 16:54:40 +0000 (16:54 +0000)]
initialise template variables
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 16:39:29 +0000 (17:39 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Don't repr the object; could be a long (and ends up with eg. "2L")
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 16:38:56 +0000 (17:38 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
the database is faster than us now
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 16:38:39 +0000 (16:38 +0000)]
the database is faster than us now
Signed-off-by: Mark Hymers <mhy@debian.org>
Chris Lamb [Mon, 26 Oct 2009 16:30:41 +0000 (16:30 +0000)]
Don't repr the object; could be a long (and ends up with eg. "2L")
Signed-off-by: Chris Lamb <lamby@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 16:25:00 +0000 (17:25 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
make cruft_report report
whoops - call it with the object, not the name
call get_suite_binaries properly
pass parameters properly
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 16:24:46 +0000 (16:24 +0000)]
make cruft_report report
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 15:24:51 +0000 (16:24 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Use the correct dictionary to lookup name of users.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Mon, 26 Oct 2009 15:23:56 +0000 (15:23 +0000)]
Use the correct dictionary to lookup name of users.
Signed-off-by: Chris Lamb <lamby@debian.org>
Mark Hymers [Mon, 26 Oct 2009 15:20:55 +0000 (15:20 +0000)]
whoops - call it with the object, not the name
Signed-off-by: Mark Hymers <mhy@debian.org>
Mark Hymers [Mon, 26 Oct 2009 15:20:06 +0000 (15:20 +0000)]
call get_suite_binaries properly
Signed-off-by: Mark Hymers <mhy@debian.org>
Mark Hymers [Mon, 26 Oct 2009 15:18:25 +0000 (15:18 +0000)]
pass parameters properly
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 15:12:48 +0000 (16:12 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
import a class we need and don't hide errors
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 15:12:26 +0000 (15:12 +0000)]
import a class we need and don't hide errors
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 15:03:55 +0000 (16:03 +0100)]
Merge commit 'mhy/master' into merge
* commit 'mhy/master':
hack around file hanging around forever
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Mark Hymers [Mon, 26 Oct 2009 15:03:27 +0000 (15:03 +0000)]
hack around file hanging around forever
Signed-off-by: Mark Hymers <mhy@debian.org>
Joerg Jaspert [Mon, 26 Oct 2009 15:03:17 +0000 (16:03 +0100)]
Merge commit 'lamby/master' into merge
* commit 'lamby/master':
Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde
Find/replace fail.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Chris Lamb [Mon, 26 Oct 2009 14:54:42 +0000 (14:54 +0000)]
Revert "Use gzip.open(.., 'rb')" as this version of python-apt is olde
This reverts commit
91cd6acebec69854074c594bf917561001f57ef4 .
Signed-off-by: Chris Lamb <lamby@debian.org>