]> git.decadent.org.uk Git - dak.git/log
dak.git
15 years agoMerge branch 'master' of /srv/ftp.debian.org/git/dak
Mark Hymers [Sat, 7 Nov 2009 14:19:21 +0000 (14:19 +0000)]
Merge branch 'master' of /srv/ftp.debian.org/git/dak

15 years agopass arguments properly to add_known_changes
Mark Hymers [Sat, 7 Nov 2009 14:19:15 +0000 (14:19 +0000)]
pass arguments properly to add_known_changes

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoOne o too much
Joerg Jaspert [Sat, 7 Nov 2009 14:02:00 +0000 (15:02 +0100)]
One o too much

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agore-enable queue-report stuff
Mark Hymers [Sat, 7 Nov 2009 13:37:52 +0000 (13:37 +0000)]
re-enable queue-report stuff

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoallow setting in_queue
Mark Hymers [Sat, 7 Nov 2009 13:34:11 +0000 (13:34 +0000)]
allow setting in_queue

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoquick fix up of queue-report for NEW
Mark Hymers [Sat, 7 Nov 2009 13:33:57 +0000 (13:33 +0000)]
quick fix up of queue-report for NEW

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoif it isn't a dictionary, don't try and use it as one...
Mark Hymers [Sat, 7 Nov 2009 13:04:46 +0000 (13:04 +0000)]
if it isn't a dictionary, don't try and use it as one...

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agofix variable name
Mark Hymers [Fri, 6 Nov 2009 00:06:40 +0000 (00:06 +0000)]
fix variable name

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agorun on all queues and don't pass useless -v
Mark Hymers [Thu, 5 Nov 2009 22:59:38 +0000 (22:59 +0000)]
run on all queues and don't pass useless -v

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoremove pointless verbose option
Mark Hymers [Thu, 5 Nov 2009 22:59:20 +0000 (22:59 +0000)]
remove pointless verbose option

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agonot everything can be done in parallel...
Mark Hymers [Thu, 5 Nov 2009 22:50:42 +0000 (22:50 +0000)]
not everything can be done in parallel...

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoadd back clean-suites
Mark Hymers [Thu, 5 Nov 2009 22:29:35 +0000 (22:29 +0000)]
add back clean-suites

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoRemove lockfile
Joerg Jaspert [Thu, 5 Nov 2009 00:20:07 +0000 (01:20 +0100)]
Remove lockfile

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agodinstall, unchecked
Joerg Jaspert [Thu, 5 Nov 2009 00:12:05 +0000 (01:12 +0100)]
dinstall, unchecked

add some comments, background some more.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agofunctions
Joerg Jaspert [Thu, 5 Nov 2009 00:00:39 +0000 (01:00 +0100)]
functions

no longer call function scripts(), instead call them all on their own
also use cmp in a little more sane way

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agobuildd
Joerg Jaspert [Wed, 4 Nov 2009 23:33:45 +0000 (00:33 +0100)]
buildd

lock the buildd push, only one can go out at any time.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoFor now do not run process-upload in dinstall
Joerg Jaspert [Wed, 4 Nov 2009 23:12:32 +0000 (00:12 +0100)]
For now do not run process-upload in dinstall

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
Joerg Jaspert [Wed, 4 Nov 2009 22:44:12 +0000 (23:44 +0100)]
Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak: (25 commits)
  remove accepted references
  re-enable fingerprint importing
  honour No-Action and say what's going on
  move build queue cleaning to manage-build-queues
  teach clean_suites about build_queue_files
  honour No-Action in clean suites
  re-enable clean-queues
  log instead of print
  update scripts for new world order
  use manage-build-queues
  remove the release file before generating the new one
  argh
  use %s
  fix os.system call
  small fixes
  more typo fixes
  and another one
  typo
  add mbq to dak.py
  add --all flag
  ...

15 years agoremove accepted references
Mark Hymers [Wed, 4 Nov 2009 22:10:28 +0000 (22:10 +0000)]
remove accepted references

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agore-enable fingerprint importing
Mark Hymers [Wed, 4 Nov 2009 21:59:19 +0000 (21:59 +0000)]
re-enable fingerprint importing

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agohonour No-Action and say what's going on
Mark Hymers [Wed, 4 Nov 2009 21:43:52 +0000 (21:43 +0000)]
honour No-Action and say what's going on

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agomove build queue cleaning to manage-build-queues
Mark Hymers [Wed, 4 Nov 2009 21:42:43 +0000 (21:42 +0000)]
move build queue cleaning to manage-build-queues

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoteach clean_suites about build_queue_files
Mark Hymers [Wed, 4 Nov 2009 21:40:04 +0000 (21:40 +0000)]
teach clean_suites about build_queue_files

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agohonour No-Action in clean suites
Mark Hymers [Wed, 4 Nov 2009 20:51:20 +0000 (20:51 +0000)]
honour No-Action in clean suites

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agore-enable clean-queues
Mark Hymers [Wed, 4 Nov 2009 20:38:52 +0000 (20:38 +0000)]
re-enable clean-queues

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agolog instead of print
Mark Hymers [Wed, 4 Nov 2009 20:02:37 +0000 (20:02 +0000)]
log instead of print

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoupdate scripts for new world order
Mark Hymers [Wed, 4 Nov 2009 19:11:03 +0000 (19:11 +0000)]
update scripts for new world order

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agouse manage-build-queues
Mark Hymers [Wed, 4 Nov 2009 19:04:09 +0000 (19:04 +0000)]
use manage-build-queues

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoremove the release file before generating the new one
Mark Hymers [Wed, 4 Nov 2009 18:57:19 +0000 (18:57 +0000)]
remove the release file before generating the new one

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoargh
Mark Hymers [Wed, 4 Nov 2009 18:47:33 +0000 (18:47 +0000)]
argh

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agouse %s
Mark Hymers [Wed, 4 Nov 2009 18:44:44 +0000 (18:44 +0000)]
use %s

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agofix os.system call
Mark Hymers [Wed, 4 Nov 2009 18:43:05 +0000 (18:43 +0000)]
fix os.system call

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agosmall fixes
Mark Hymers [Wed, 4 Nov 2009 18:40:47 +0000 (18:40 +0000)]
small fixes

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agomore typo fixes
Mark Hymers [Wed, 4 Nov 2009 18:32:15 +0000 (18:32 +0000)]
more typo fixes

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoand another one
Mark Hymers [Wed, 4 Nov 2009 18:30:14 +0000 (18:30 +0000)]
and another one

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agotypo
Mark Hymers [Wed, 4 Nov 2009 18:29:21 +0000 (18:29 +0000)]
typo

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'mhy/master'
Mark Hymers [Wed, 4 Nov 2009 18:25:27 +0000 (18:25 +0000)]
Merge commit 'mhy/master'

15 years agoadd mbq to dak.py
Mark Hymers [Wed, 4 Nov 2009 18:25:18 +0000 (18:25 +0000)]
add mbq to dak.py

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'mhy/master'
Mark Hymers [Wed, 4 Nov 2009 18:20:41 +0000 (18:20 +0000)]
Merge commit 'mhy/master'

15 years agoadd --all flag
Mark Hymers [Wed, 4 Nov 2009 11:26:48 +0000 (11:26 +0000)]
add --all flag

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agowell spotted by Ganneff
Mark Hymers [Wed, 4 Nov 2009 11:21:44 +0000 (11:21 +0000)]
well spotted by Ganneff

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoorder files so that Packages/Sources files make sense and can be rsync'd sanely
Mark Hymers [Wed, 4 Nov 2009 10:33:41 +0000 (10:33 +0000)]
order files so that Packages/Sources files make sense and can be rsync'd sanely

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoLintian tag changes
Joerg Jaspert [Wed, 4 Nov 2009 00:15:49 +0000 (01:15 +0100)]
Lintian tag changes

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'twerner/msfl' into merge
Joerg Jaspert [Tue, 3 Nov 2009 21:02:18 +0000 (22:02 +0100)]
Merge commit 'twerner/msfl' into merge

* commit 'twerner/msfl':
  make dak generate-filelist the default
  fix indentation

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agomake dak generate-filelist the default
Torsten Werner [Tue, 3 Nov 2009 20:49:41 +0000 (21:49 +0100)]
make dak generate-filelist the default

* replaces functions write_filelist(s) in msfl

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years agomanage_build_queues fixups
Mark Hymers [Tue, 3 Nov 2009 17:53:05 +0000 (17:53 +0000)]
manage_build_queues fixups

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agofirst pass at manage-build-queues
Mark Hymers [Tue, 3 Nov 2009 17:33:10 +0000 (17:33 +0000)]
first pass at manage-build-queues

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Tue, 3 Nov 2009 15:52:20 +0000 (15:52 +0000)]
Merge commit 'ftpmaster/master'

15 years agoqueue_id -> build_queue_id
Mark Hymers [Tue, 3 Nov 2009 15:52:00 +0000 (15:52 +0000)]
queue_id -> build_queue_id

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge branch 'master' into msfl
Torsten Werner [Mon, 2 Nov 2009 21:50:05 +0000 (22:50 +0100)]
Merge branch 'master' into msfl

15 years agofix indentation
Torsten Werner [Mon, 2 Nov 2009 21:29:10 +0000 (22:29 +0100)]
fix indentation

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years ago Fix indent
Joerg Jaspert [Mon, 2 Nov 2009 21:27:16 +0000 (22:27 +0100)]
 Fix indent

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'twerner/msfl' into merge
Joerg Jaspert [Mon, 2 Nov 2009 21:26:09 +0000 (22:26 +0100)]
Merge commit 'twerner/msfl' into merge

* commit 'twerner/msfl':
  commit changes to database

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agocommit changes to database
Torsten Werner [Mon, 2 Nov 2009 21:25:05 +0000 (22:25 +0100)]
commit changes to database

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years agoMerge commit 'twerner/msfl' into merge
Joerg Jaspert [Mon, 2 Nov 2009 21:01:02 +0000 (22:01 +0100)]
Merge commit 'twerner/msfl' into merge

* commit 'twerner/msfl':
  require db schema 23
  add generate-filelist to control script
  add license and reindent file
  add database update script for generate_filelist
  add generate_filelist.py to maybe replace msfl.py

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agorequire db schema 23
Torsten Werner [Mon, 2 Nov 2009 20:23:27 +0000 (21:23 +0100)]
require db schema 23

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years agoadd generate-filelist to control script
Torsten Werner [Mon, 2 Nov 2009 20:15:38 +0000 (21:15 +0100)]
add generate-filelist to control script

15 years agoadd license and reindent file
Torsten Werner [Mon, 2 Nov 2009 20:14:20 +0000 (21:14 +0100)]
add license and reindent file

15 years agoadd database update script for generate_filelist
Torsten Werner [Mon, 2 Nov 2009 20:00:53 +0000 (21:00 +0100)]
add database update script for generate_filelist

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years agoadd generate_filelist.py to maybe replace msfl.py
Torsten Werner [Mon, 2 Nov 2009 19:36:25 +0000 (20:36 +0100)]
add generate_filelist.py to maybe replace msfl.py

Signed-off-by: Torsten Werner <twerner@debian.org>
15 years agoChange lintian.tags
Joerg Jaspert [Mon, 2 Nov 2009 19:55:18 +0000 (20:55 +0100)]
Change lintian.tags

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agodisable fingerprint runs temporarily
Mark Hymers [Sun, 1 Nov 2009 23:27:34 +0000 (23:27 +0000)]
disable fingerprint runs temporarily

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Sun, 1 Nov 2009 22:58:30 +0000 (23:58 +0100)]
Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  It's clearly too late: fix syntax error

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoIt's clearly too late: fix syntax error
Frank Lichtenheld [Sun, 1 Nov 2009 22:56:41 +0000 (22:56 +0000)]
It's clearly too late: fix syntax error

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Sun, 1 Nov 2009 22:54:40 +0000 (23:54 +0100)]
Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  process-upload: remove needless print to stderr

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoIts not p-u, its p-u, damnit
Joerg Jaspert [Sun, 1 Nov 2009 22:36:37 +0000 (23:36 +0100)]
Its not p-u, its p-u, damnit

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agodinstall
Joerg Jaspert [Sun, 1 Nov 2009 22:25:25 +0000 (23:25 +0100)]
dinstall

remove now unused functions
move functions into dinstall.functions
move variables into dinstall.variables
do not run various functions that are still todo:

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoprocess-upload: remove needless print to stderr
Frank Lichtenheld [Sun, 1 Nov 2009 22:22:40 +0000 (22:22 +0000)]
process-upload: remove needless print to stderr

This was causing cron mails for every cron.unchecked run.

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agoMerge branch 'merge'
Joerg Jaspert [Sun, 1 Nov 2009 22:18:25 +0000 (23:18 +0100)]
Merge branch 'merge'

* merge:
  add_file_from_pool: Fix typo in variable name

15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Sun, 1 Nov 2009 22:18:18 +0000 (23:18 +0100)]
Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  add_file_from_pool: Fix typo in variable name
  notice
  scripts

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoadd_file_from_pool: Fix typo in variable name
Frank Lichtenheld [Sun, 1 Nov 2009 22:16:03 +0000 (22:16 +0000)]
add_file_from_pool: Fix typo in variable name

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agovarious echos now logs
Joerg Jaspert [Sun, 1 Nov 2009 21:31:18 +0000 (22:31 +0100)]
various echos now logs

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agodinstall
Joerg Jaspert [Sun, 1 Nov 2009 21:31:09 +0000 (22:31 +0100)]
dinstall

and moved mkchecksums into dinstall

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agomake mkfilesindices a function
Joerg Jaspert [Sun, 1 Nov 2009 21:25:02 +0000 (22:25 +0100)]
make mkfilesindices a function

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agodinstall
Joerg Jaspert [Sun, 1 Nov 2009 21:20:03 +0000 (22:20 +0100)]
dinstall

always run in umask 022, functions wanting a difference need to define it.
also always run in locale C

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agocopyoverrides
Joerg Jaspert [Sun, 1 Nov 2009 21:06:24 +0000 (22:06 +0100)]
copyoverrides

and in dinstall

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agols
Joerg Jaspert [Sun, 1 Nov 2009 21:01:34 +0000 (22:01 +0100)]
ls

do not warn about the notice file, but do it when the daily.lock is there.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge branch 'merge'
Joerg Jaspert [Sun, 1 Nov 2009 20:57:44 +0000 (21:57 +0100)]
Merge branch 'merge'

* merge:
  make sure that we add all poolfiles to the buildd queue

15 years agoMerge commit 'djpig/djpig' into merge
Joerg Jaspert [Sun, 1 Nov 2009 20:57:35 +0000 (21:57 +0100)]
Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  make sure that we add all poolfiles to the buildd queue

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agomake sure that we add all poolfiles to the buildd queue
Frank Lichtenheld [Sun, 1 Nov 2009 20:30:22 +0000 (20:30 +0000)]
make sure that we add all poolfiles to the buildd queue

We missed the .orig.tar in cases where it was already in
the pool.

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
15 years agonotice
Joerg Jaspert [Sun, 1 Nov 2009 20:50:12 +0000 (21:50 +0100)]
notice

remove an unneccessary notice

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoscripts
Joerg Jaspert [Sun, 1 Nov 2009 20:49:04 +0000 (21:49 +0100)]
scripts

move two scripts into functions of dinstall

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Sun, 1 Nov 2009 19:54:24 +0000 (20:54 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  Remove duplicated section-is-dh_make-template

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoRemove duplicated section-is-dh_make-template
Chris Lamb [Sun, 1 Nov 2009 10:57:49 +0000 (10:57 +0000)]
Remove duplicated section-is-dh_make-template

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoForce doc regeneration
Mark Hymers [Sun, 1 Nov 2009 10:27:43 +0000 (10:27 +0000)]
Force doc regeneration

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoUpdate BuildQueue's __repr__ descriptor.
Chris Lamb [Sun, 1 Nov 2009 10:23:40 +0000 (10:23 +0000)]
Update BuildQueue's __repr__ descriptor.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoFix references to get_or_set_queue in new_security_installs
Chris Lamb [Sun, 1 Nov 2009 10:22:54 +0000 (10:22 +0000)]
Fix references to get_or_set_queue in new_security_installs

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agoAdd test that imports all dak commands.
Chris Lamb [Sun, 1 Nov 2009 10:19:48 +0000 (10:19 +0000)]
Add test that imports all dak commands.

Signed-off-by: Chris Lamb <lamby@debian.org>
15 years agotemporarily stop people during NEW processing
Mark Hymers [Sun, 1 Nov 2009 10:17:33 +0000 (10:17 +0000)]
temporarily stop people during NEW processing

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agotypo fix
Mark Hymers [Sun, 1 Nov 2009 10:06:29 +0000 (10:06 +0000)]
typo fix

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoImport os
Mark Hymers [Sun, 1 Nov 2009 10:05:37 +0000 (10:05 +0000)]
Import os

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoMerge branch 'merge'
Joerg Jaspert [Sun, 1 Nov 2009 09:59:04 +0000 (10:59 +0100)]
Merge branch 'merge'

* merge:
  use central function instead of reimplementing
  don't let Ganneff send messages in german

15 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Sun, 1 Nov 2009 09:58:51 +0000 (10:58 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  use central function instead of reimplementing

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agouse central function instead of reimplementing
Mark Hymers [Sun, 1 Nov 2009 09:55:44 +0000 (09:55 +0000)]
use central function instead of reimplementing

Signed-off-by: Mark Hymers <mhy@debian.org>
15 years agoIts buildd
Joerg Jaspert [Sun, 1 Nov 2009 09:53:48 +0000 (10:53 +0100)]
Its buildd

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'mhy/master' into merge
Joerg Jaspert [Sun, 1 Nov 2009 09:44:51 +0000 (10:44 +0100)]
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  don't let Ganneff send messages in german

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge commit 'ftpmaster/master'
Mark Hymers [Sun, 1 Nov 2009 09:43:45 +0000 (09:43 +0000)]
Merge commit 'ftpmaster/master'

15 years agodo not do this
Joerg Jaspert [Sun, 1 Nov 2009 09:31:15 +0000 (10:31 +0100)]
do not do this

Signed-off-by: Joerg Jaspert <joerg@debian.org>
15 years agoMerge branch 'merge'
Joerg Jaspert [Sun, 1 Nov 2009 09:28:38 +0000 (10:28 +0100)]
Merge branch 'merge'

* merge:
  lenny's python-apt does not support "#" comments.

15 years agoMerge commit 'lamby/master' into merge
Joerg Jaspert [Sun, 1 Nov 2009 09:28:25 +0000 (10:28 +0100)]
Merge commit 'lamby/master' into merge

* commit 'lamby/master':
  lenny's python-apt does not support "#" comments.
  no i-u-f-p
  cron

Signed-off-by: Joerg Jaspert <joerg@debian.org>