]> err.no Git - dak/log
dak
16 years agomd5sum check, passive mode
Joerg Jaspert [Sun, 21 Sep 2008 14:45:02 +0000 (16:45 +0200)]
md5sum check, passive mode

Only check md5sums after transfering stuff to the target if we are
configured to do this. We can't do this via ftp, as the files on
ftp.upload.debian.org aren't readable for us (vsftpd runs as a user
not allowed to read them).

Also, no need to check them - if the files are really broken then the
next queued will detect that and mail the maintainer anyways. So it
wont get broken files near the archive.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoUse perltidy on debianqueued
Joerg Jaspert [Sun, 21 Sep 2008 14:28:27 +0000 (16:28 +0200)]
Use perltidy on debianqueued

Use perltidy -i=2 -syn -lp -csc -cscw -ce -l=78 -cti=1  -b debianqueued

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agomd5sum check option
Joerg Jaspert [Sun, 21 Sep 2008 14:03:16 +0000 (16:03 +0200)]
md5sum check option

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoReadme foo
Joerg Jaspert [Sun, 21 Sep 2008 12:25:26 +0000 (14:25 +0200)]
Readme foo

Add a new queue readme for ravel, correct hostname for ftp-master.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoAdd config for ssh upload queue
Joerg Jaspert [Sun, 21 Sep 2008 11:32:44 +0000 (13:32 +0200)]
Add config for ssh upload queue

Add a new config file, for use on ravel, where we will put the ssh upload queue

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoDeferred queue overview
Joerg Jaspert [Sun, 21 Sep 2008 08:03:24 +0000 (10:03 +0200)]
Deferred queue overview

Added the deferred queue overview

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'tomv_w/master' into merge
Joerg Jaspert [Sun, 21 Sep 2008 07:59:01 +0000 (09:59 +0200)]
Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  walk directories ourselves instead of taking a list
  add summary of deferred queue

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agowalk directories ourselves instead of taking a list
Thomas Viehmann [Sat, 20 Sep 2008 22:52:05 +0000 (00:52 +0200)]
walk directories ourselves instead of taking a list

16 years agoadd summary of deferred queue
Thomas Viehmann [Sat, 20 Sep 2008 22:35:25 +0000 (00:35 +0200)]
add summary of deferred queue

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoClarify rm /
Joerg Jaspert [Sat, 20 Sep 2008 16:20:01 +0000 (18:20 +0200)]
Clarify rm /

/ are allowed in rm - for the DELAYED queue

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge branch 'merge'
Joerg Jaspert [Sat, 20 Sep 2008 16:04:44 +0000 (18:04 +0200)]
Merge branch 'merge'

* merge:
  don't try to remove file --searchdirs, prune some paths from messages

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'tomv_w/master' into merge
Joerg Jaspert [Sat, 20 Sep 2008 16:02:31 +0000 (18:02 +0200)]
Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  don't try to remove file --searchdirs, prune some paths from messages

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoUpdate the text
Joerg Jaspert [Sat, 20 Sep 2008 15:59:17 +0000 (17:59 +0200)]
Update the text

Now it matches reality with DELAYED/DEFERRED and mv

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodon't try to remove file --searchdirs, prune some paths from messages
Thomas Viehmann [Sat, 20 Sep 2008 15:54:59 +0000 (17:54 +0200)]
don't try to remove file --searchdirs, prune some paths from messages

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoMerge commit 'tomv_w/master' into merge
Joerg Jaspert [Sat, 20 Sep 2008 14:21:57 +0000 (16:21 +0200)]
Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  * Redo:   Name it DEFERRED
  split 'cancel' command off rm, use DELAYED/#-day/ prefixes, and rename 'mv' to 'reschedule'
  * fix fatal typo

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge branch 'queued'
Thomas Viehmann [Tue, 16 Sep 2008 19:02:08 +0000 (19:02 +0000)]
Merge branch 'queued'

16 years ago* Redo: Name it DEFERRED
Thomas Viehmann [Tue, 16 Sep 2008 18:58:45 +0000 (18:58 +0000)]
* Redo:   Name it DEFERRED
* Redo:   Oi, Wow, that should have been committed centuries ago.
* Redo:   Small changes
  Remove lotsa old cvs history
  Change maintainer name
  Modify config to use the path we want
* Redo:   Merge commit 'tomv_w/master' into merge
  * commit 'tomv_w/master':
    * no / in x-day
    * fix bug in .commands rm-handling
    * add delayed aging, extend is_on_target to consider all files
    * debianqueued: finish new-style command handling
    * debianqueued: allow removal from target delayed queue
    * debianqueued/config: add delayed fields to sample config

This reverts commits 6ad61ef85be7237455f7fe8216289fcef31ae1f0,
                     0075ee02039d69dce15aeff9804a82a2be1f8073
                     85b005fd31182e076163b76efc9dcf7944d1c9c0
                     e40836af9e5659de995169789d2165566a2a5c77

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agosplit 'cancel' command off rm, use DELAYED/#-day/ prefixes, and rename 'mv' to 'resch...
Thomas Viehmann [Tue, 16 Sep 2008 18:33:03 +0000 (20:33 +0200)]
split 'cancel' command off rm, use DELAYED/#-day/ prefixes, and rename 'mv' to 'reschedule'

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years ago* fix fatal typo
Thomas Viehmann [Tue, 16 Sep 2008 15:37:38 +0000 (17:37 +0200)]
* fix fatal typo

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoRevert "Merge commit 'tomv_w/master' into merge"
Joerg Jaspert [Tue, 16 Sep 2008 06:02:41 +0000 (08:02 +0200)]
Revert "Merge commit 'tomv_w/master' into merge"

This reverts commit 47384ef2b7b6c6239b41623ad8612ac7fd32d089.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoRevert "Small changes"
Joerg Jaspert [Tue, 16 Sep 2008 06:01:27 +0000 (08:01 +0200)]
Revert "Small changes"

This reverts commit 9eb4b6222ce4cd1a31956c8781dca415e994cca6.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoRevert "Oi"
Joerg Jaspert [Tue, 16 Sep 2008 06:01:19 +0000 (08:01 +0200)]
Revert "Oi"

This reverts commit c3ff19c4244b775cd999293f7a3299c736e232bb.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoRevert "Name it DEFERRED"
Joerg Jaspert [Tue, 16 Sep 2008 06:01:05 +0000 (08:01 +0200)]
Revert "Name it DEFERRED"

This reverts commit 668929470009cd172e9de5258ed19a1c59050ab9.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoName it DEFERRED
Joerg Jaspert [Mon, 15 Sep 2008 22:13:09 +0000 (00:13 +0200)]
Name it DEFERRED

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoOi
Joerg Jaspert [Mon, 15 Sep 2008 20:47:55 +0000 (22:47 +0200)]
Oi

Wow, that should have been committed centuries ago.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoSmall changes
Joerg Jaspert [Mon, 15 Sep 2008 20:37:14 +0000 (22:37 +0200)]
Small changes

Remove lotsa old cvs history
Change maintainer name
Modify config to use the path we want

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'tomv_w/master' into merge
Joerg Jaspert [Mon, 15 Sep 2008 20:28:30 +0000 (22:28 +0200)]
Merge commit 'tomv_w/master' into merge

* commit 'tomv_w/master':
  * no / in x-day
  * fix bug in .commands rm-handling
  * add delayed aging, extend is_on_target to consider all files
  * debianqueued: finish new-style command handling
  * debianqueued: allow removal from target delayed queue
  * debianqueued/config: add delayed fields to sample config
  2008-09-11  Thomas Viehmann  <tv@beamnet.de>

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years ago* no / in x-day
Thomas Viehmann [Mon, 15 Sep 2008 20:01:04 +0000 (22:01 +0200)]
* no / in x-day

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years ago* fix bug in .commands rm-handling
Thomas Viehmann [Sat, 13 Sep 2008 20:34:25 +0000 (22:34 +0200)]
* fix bug in .commands rm-handling

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years ago* add delayed aging, extend is_on_target to consider all files
Thomas Viehmann [Sat, 13 Sep 2008 19:35:13 +0000 (21:35 +0200)]
* add delayed aging, extend is_on_target to consider all files

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoMerge commit 'pkern/master' into merge
Joerg Jaspert [Sat, 13 Sep 2008 14:44:11 +0000 (16:44 +0200)]
Merge commit 'pkern/master' into merge

* commit 'pkern/master':
  daklib/utils.py (dump_vars): do not blindly re-raise exceptions
  make .dak files world-readable
  remove oldstable-security/amd64 check

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodaklib/utils.py (dump_vars): do not blindly re-raise exceptions
Philipp Kern [Sat, 13 Sep 2008 14:42:16 +0000 (14:42 +0000)]
daklib/utils.py (dump_vars): do not blindly re-raise exceptions

16 years agoMerge branch 'master' of /srv/ftp.debian.org/git/dak
Philipp Kern [Sat, 13 Sep 2008 14:40:02 +0000 (14:40 +0000)]
Merge branch 'master' of /srv/ftp.debian.org/git/dak

Conflicts:

ChangeLog

16 years agoUse the right dir (not critical, the other is symlinked).
Joerg Jaspert [Sat, 13 Sep 2008 14:24:47 +0000 (16:24 +0200)]
Use the right dir (not critical, the other is symlinked).

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agomake .dak files world-readable
Philipp Kern [Sat, 13 Sep 2008 14:21:13 +0000 (16:21 +0200)]
make .dak files world-readable

2008-09-13  Philipp Kern  <pkern@debian.org>

        * dak/queue.py (dump_vars): make .dak u,g=rw,o=r; James'
        assumption (as stated in 2002-05-18's ChangeLog entry)
        was that people will use the information therein albeit
        it is "just" a duplication of information present in
        other control files; people should still not use it
        as source of information but access to those files makes
        dak debugging easier and there is no leak of sensitive
        information involved

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoUnbreak dinstall
Joerg Jaspert [Sat, 13 Sep 2008 09:17:58 +0000 (11:17 +0200)]
Unbreak dinstall

What a difference a little .sh at the end can make...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years ago* debianqueued: finish new-style command handling
Thomas Viehmann [Fri, 12 Sep 2008 23:10:24 +0000 (01:10 +0200)]
* debianqueued: finish new-style command handling

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoTypo fix
Joerg Jaspert [Fri, 12 Sep 2008 18:18:10 +0000 (20:18 +0200)]
Typo fix

s/i/file/, it really helps to use the right variable names...
Thanks Otavio.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoremove oldstable-security/amd64 check
Philipp Kern [Fri, 12 Sep 2008 12:19:48 +0000 (14:19 +0200)]
remove oldstable-security/amd64 check

2008-09-12  Philipp Kern  <pkern@debian.org>

        * dak/new_security_install.py (actually_upload): remove
        oldstable-security/amd64 check; Etch, as the next oldstable,
        already had proper amd64 support

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoPseudo packages
Joerg Jaspert [Thu, 11 Sep 2008 21:35:59 +0000 (23:35 +0200)]
Pseudo packages

Moved pseudo packages to the bts people. Now fetch them from there.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years ago* debianqueued: allow removal from target delayed queue
Thomas Viehmann [Thu, 11 Sep 2008 20:16:26 +0000 (22:16 +0200)]
* debianqueued: allow removal from target delayed queue

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years ago* debianqueued/config: add delayed fields to sample config
Thomas Viehmann [Thu, 11 Sep 2008 18:38:41 +0000 (20:38 +0200)]
* debianqueued/config: add delayed fields to sample config

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years ago2008-09-11 Thomas Viehmann <tv@beamnet.de>
Thomas Viehmann [Thu, 11 Sep 2008 15:53:05 +0000 (15:53 +0000)]
2008-09-11  Thomas Viehmann  <tv@beamnet.de>

       * debianqueued: Add DELAYED-support.

Signed-off-by: Thomas Viehmann <tv@beamnet.de>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Mon, 8 Sep 2008 20:07:22 +0000 (22:07 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  daklib/utils.py (build_file_list): ignore missing dsc format headers

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodaklib/utils.py (build_file_list): ignore missing dsc format headers
Philipp Kern [Mon, 8 Sep 2008 20:06:03 +0000 (20:06 +0000)]
daklib/utils.py (build_file_list): ignore missing dsc format headers

2008-09-08  Philipp Kern  <pkern@debian.org>

        * daklib/utils.py (build_file_list): do not die on very
        old dsc files without format header

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Mon, 8 Sep 2008 19:53:11 +0000 (21:53 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  dak/check_archive.py (check_checksums): rewind the file pointer

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodak/check_archive.py (check_checksums): rewind the file pointer
Philipp Kern [Mon, 8 Sep 2008 19:51:44 +0000 (19:51 +0000)]
dak/check_archive.py (check_checksums): rewind the file pointer

2008-09-08  Philipp Kern  <pkern@debian.org>

        * dak/check_archive.py (check_checksums): rewind the files
        before the sha1sum/sha256sum checks as they got seeked by
        md5sum

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sun, 7 Sep 2008 21:55:06 +0000 (23:55 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  do not try to access non-existant members, fix up the last patch

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodo not try to access non-existant members, fix up the last patch
Philipp Kern [Sun, 7 Sep 2008 21:54:20 +0000 (21:54 +0000)]
do not try to access non-existant members, fix up the last patch

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sun, 7 Sep 2008 21:50:29 +0000 (23:50 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  do not check for superfluous checksums-* entries for now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodo not check for superfluous checksums-* entries for now
Philipp Kern [Sun, 7 Sep 2008 21:46:51 +0000 (21:46 +0000)]
do not check for superfluous checksums-* entries for now

The current check for additional entries in checksums-* which are not
covered by entries in files is flawed because files could be modified
by autobyhand or sometimes when the file's already in the pool.

We need to rework this to look into the original files dict instead.

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoShutup
Joerg Jaspert [Sun, 7 Sep 2008 21:27:00 +0000 (23:27 +0200)]
Shutup

For now dont warn if file is not found.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sun, 7 Sep 2008 20:52:43 +0000 (22:52 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  dak/process_accepted.py (install): use dsc_file instead of file

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sun, 7 Sep 2008 20:51:34 +0000 (22:51 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  dak/process_accepted.py (install): use dsc_file instead of file

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodak/process_accepted.py (install): use dsc_file instead of file
Philipp Kern [Sun, 7 Sep 2008 20:51:23 +0000 (22:51 +0200)]
dak/process_accepted.py (install): use dsc_file instead of file

        * dak/process_accepted.py (install): better use dsc_file
        instead of the (for the loop iteration) static file
        variable

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agodak/process_accepted.py (install): use dsc_file instead of file
Philipp Kern [Sun, 7 Sep 2008 20:50:06 +0000 (22:50 +0200)]
dak/process_accepted.py (install): use dsc_file instead of file

        * dak/process_accepted.py (install): better use dsc_file
        instead of the (for the loop iteration) static file
        variable

Signed-off-by: Philipp Kern <pkern@debian.org>
# Please enter the commit message for your changes.
# (Comment lines starting with '#' will not be included)
# On branch new-master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   ChangeLog
# modified:   dak/process_accepted.py
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
# modified:   daklib/database.py
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
# config/asterix/
# diff
# ftp/
# incoming/
# lock/
# log/
# queue/
# web/removals.txt

16 years agoRemove debug statement
Joerg Jaspert [Sun, 7 Sep 2008 20:00:41 +0000 (22:00 +0200)]
Remove debug statement

Remove a debug statement that was left in.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sun, 7 Sep 2008 19:57:57 +0000 (21:57 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  wrap try..except..finally the python 2.4 way

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agowrap try..except..finally the python 2.4 way
Philipp Kern [Sun, 7 Sep 2008 19:48:53 +0000 (19:48 +0000)]
wrap try..except..finally the python 2.4 way

2008-09-07  Philipp Kern  <pkern@debian.org>

        * daklib/utils.py (check_hash): try..except..finally only
        works on python >=2.5.

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master' into merge
Joerg Jaspert [Sun, 7 Sep 2008 19:29:26 +0000 (21:29 +0200)]
Merge commit 'pkern/master' into merge

* commit 'pkern/master':
  more safety nets when our functions do not do what we expect from them

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agomore safety nets when our functions do not do what we expect from them
Philipp Kern [Sun, 7 Sep 2008 15:16:28 +0000 (17:16 +0200)]
more safety nets when our functions do not do what we expect from them

2008-09-07  Philipp Kern  <pkern@debian.org>

        * daklib/utils.py (check_hash): change the comment and warn
        if a file is not found when checking the hashes (i.e. when
        it is probably in the pool)

* daklib/utils.py (check_size): do not bail out if the file
is not found, because it may be in the pool

        * dak/process_accepted.py (install): bail out and skip the
        upload when ensure_hashes fails, print the rejection messages
        as warnings

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master' into merge
Joerg Jaspert [Sun, 7 Sep 2008 14:51:57 +0000 (16:51 +0200)]
Merge commit 'pkern/master' into merge

* commit 'pkern/master':
  Revert "revert all my stupid commits, we'll try this again later when we have a test server"
  Revert "and revert the remainder"
  implement sensible handling of checksum fields in .changes and .dsc

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge branch 'master' of ftpmaster's dak repository
Philipp Kern [Sun, 7 Sep 2008 14:33:11 +0000 (14:33 +0000)]
Merge branch 'master' of ftpmaster's dak repository

Conflicts:

ChangeLog

16 years agoMerge commit 'pkern/p-u-new' into merge
Joerg Jaspert [Sat, 6 Sep 2008 11:38:41 +0000 (13:38 +0200)]
Merge commit 'pkern/p-u-new' into merge

* commit 'pkern/p-u-new':
  dak/process_new.py (is_source_in_queue_dir): access u instead of Upload

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agodak/process_new.py (is_source_in_queue_dir): access u instead of Upload
Philipp Kern [Sat, 6 Sep 2008 11:35:42 +0000 (11:35 +0000)]
dak/process_new.py (is_source_in_queue_dir): access u instead of Upload

2008-09-06  Philipp Kern  <pkern@debian.org>

        * dak/process_new.py (is_source_in_queue_dir): Access the right
        variable to check if the given entry in the queue is the sourceful
        upload we are looking for.

16 years agoPseudopackages
Joerg Jaspert [Tue, 2 Sep 2008 20:09:55 +0000 (22:09 +0200)]
Pseudopackages

Added last pseudopackages ever. (Well, before the two files finally go
and are maintained by the BTS people).

Signed-off-by: Joerg Jaspert <joerg@debian.org>
16 years agoMerge branch 'checksums'
Philipp Kern [Tue, 2 Sep 2008 19:01:44 +0000 (21:01 +0200)]
Merge branch 'checksums'

Conflicts:

ChangeLog
daklib/utils.py

16 years agoRevert "revert all my stupid commits, we'll try this again later when we have a test...
Philipp Kern [Tue, 2 Sep 2008 18:58:48 +0000 (20:58 +0200)]
Revert "revert all my stupid commits, we'll try this again later when we have a test server"

This reverts commit aa83ebb15882823869b109d370e24ef3efd730f8.

Conflicts:

ChangeLog

16 years agoRevert "and revert the remainder"
Philipp Kern [Tue, 2 Sep 2008 18:58:00 +0000 (20:58 +0200)]
Revert "and revert the remainder"

This reverts commit 536cb00b606a8581a76b66f55a58eabdf9f7fd3d.

16 years agodak/process_new.py (_accept)
Joerg Jaspert [Mon, 1 Sep 2008 22:17:25 +0000 (00:17 +0200)]
dak/process_new.py (_accept)

Fix Philipps new helper function to not break by moving Upload.build_summaries there.

16 years agoMerge commit 'pkern/master' into merge
Joerg Jaspert [Mon, 1 Sep 2008 18:50:25 +0000 (20:50 +0200)]
Merge commit 'pkern/master' into merge

* commit 'pkern/master':
  cosmetic fixes for do_accept and do_accept_stableupdate

16 years agocosmetic fixes for do_accept and do_accept_stableupdate
Philipp Kern [Sun, 31 Aug 2008 09:37:33 +0000 (09:37 +0000)]
cosmetic fixes for do_accept and do_accept_stableupdate

2008-08-31  Philipp Kern  <pkern@debian.org>

        * dak/process_new.py (_accept): new helper function to accept
        an upload regularly, obeying no-action if set
        * dak/process_new.py (do_accept): use _accept
        * dak/process_new.py (do_accept_stableupdate): bail out in else
        on binary uploads, in case we missed something; use the _accept
        helper; reordered the queue checks to do frequent cases first

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sat, 30 Aug 2008 18:56:00 +0000 (20:56 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  dak/process_new.py (is_source_in_queue_dir): add the queue path to the changes filename

16 years agodak/process_new.py (is_source_in_queue_dir): add the queue path to the changes filename
Philipp Kern [Sat, 30 Aug 2008 18:51:15 +0000 (18:51 +0000)]
dak/process_new.py (is_source_in_queue_dir): add the queue path to the changes filename

* dak/process_new.py (is_source_in_queue_dir): join the queue path
  because os.listdir entries come with their path stripped

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Sat, 30 Aug 2008 16:25:07 +0000 (18:25 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  process_new/do_accept_stableupdate: state what we intend to do

16 years agoprocess_new/do_accept_stableupdate: state what we intend to do
Philipp Kern [Sat, 30 Aug 2008 16:19:01 +0000 (16:19 +0000)]
process_new/do_accept_stableupdate: state what we intend to do

2008-08-30  Philipp Kern  <pkern@debian.org>

        * dak/process_new.py (do_accept_stableupdate): state what we intend
        to do

Signed-off-by: Philipp Kern <pkern@debian.org>
16 years agoMerge commit 'pkern/master'
Joerg Jaspert [Fri, 29 Aug 2008 20:25:10 +0000 (22:25 +0200)]
Merge commit 'pkern/master'

* commit 'pkern/master':
  fix proposed-updates processing in dinstall: actually accept sourceful uploads
  dak/process_new.py: do not try to free the unchecked lockfile in no-action mode

16 years agoimplement sensible handling of checksum fields in .changes and .dsc
Philipp Kern [Thu, 28 Aug 2008 20:47:22 +0000 (22:47 +0200)]
implement sensible handling of checksum fields in .changes and .dsc

2008-08-28  Philipp Kern  <pkern@debian.org>

* daklib/utils.py (check_hashes): adapt to different API, check
sizes separately

* daklib/utils.py (parse_changes, parse_deb822): refactor
the string-based logic of parse_changes into a new function
parse_deb822; parse_changes itself remains file-based

* daklib/utils.py (hash_key): gives the key of a hash in the
files dict

* daklib/utils.py (create_hash, check_size): made more readable

* daklib/utils.py (check_hash): just check the hashes and complain
about missing checksums

* daklib/utils.py (check_hash_fields): function to reject unknown
checksums fields

* daklib/utils.py (_ensure_changes_hash, _ensure_dsc_hash): helper
functions for ensure_hashes; check their corresponding manifests'
hashes

* daklib/utils.py (ensure_hashes): retrieve the checksums fields
from the original filecontents blob so that they do not need to
be present in the .dak; refactored the actual checks by calling
the aforementioned helper functions

* daklib/utils.py (parse_checksums): parse a given checksums field
in a manifest and insert the values found into the files dict,
checking the file sizes on the way

16 years agofix proposed-updates processing in dinstall: actually accept sourceful uploads
Philipp Kern [Tue, 26 Aug 2008 10:25:39 +0000 (10:25 +0000)]
fix proposed-updates processing in dinstall: actually accept sourceful uploads

* dak/process_new.py (is_source_in_queue_dir): fix variable usage
* dak/process_new.py (move_to_holding): just state what we intend
  to do in no-action mode
* dak/process_new.py (do_accept_stableupdate): fetch summaries,
  fix invokation of is_source_in_queue_dir, actually accept sourceful
  uploads in p-u holding

16 years agodak/process_new.py: do not try to free the unchecked lockfile in no-action mode
Philipp Kern [Tue, 26 Aug 2008 10:19:49 +0000 (10:19 +0000)]
dak/process_new.py: do not try to free the unchecked lockfile in no-action mode

16 years agoWe dont want i18n to ever fail dinstall, add a || true
Joerg Jaspert [Sat, 16 Aug 2008 12:48:40 +0000 (14:48 +0200)]
We dont want i18n to ever fail dinstall, add a || true

16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 05:15:56 +0000 (07:15 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  and revert the remainder
  revert all my stupid commits, we'll try this again later when we have a test server
  Revert "use correct field names"
  use correct field names

16 years agoand revert the remainder
Mark Hymers [Sat, 16 Aug 2008 05:14:27 +0000 (05:14 +0000)]
and revert the remainder

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agorevert all my stupid commits, we'll try this again later when we have a test server
Mark Hymers [Sat, 16 Aug 2008 05:11:46 +0000 (05:11 +0000)]
revert all my stupid commits, we'll try this again later when we have a test server

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoRevert "use correct field names"
Mark Hymers [Sat, 16 Aug 2008 05:10:22 +0000 (05:10 +0000)]
Revert "use correct field names"

This reverts commit f50c6be13c107a29ed5241c52b3e5c8928bed7bd.

16 years agouse correct field names
Mark Hymers [Sat, 16 Aug 2008 04:53:33 +0000 (04:53 +0000)]
use correct field names

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 04:52:12 +0000 (06:52 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  fix set_files_id routine

16 years agofix set_files_id routine
Mark Hymers [Sat, 16 Aug 2008 04:51:44 +0000 (04:51 +0000)]
fix set_files_id routine

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 04:16:45 +0000 (06:16 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  another attempt to add these damned hashes

16 years agoanother attempt to add these damned hashes
Mark Hymers [Sat, 16 Aug 2008 04:16:20 +0000 (04:16 +0000)]
another attempt to add these damned hashes

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 03:50:04 +0000 (05:50 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  I hate it when Ganneff is right
  don't assume we can check for the checksums fields

16 years agoI hate it when Ganneff is right
Mark Hymers [Sat, 16 Aug 2008 03:48:55 +0000 (03:48 +0000)]
I hate it when Ganneff is right

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agodon't assume we can check for the checksums fields
Mark Hymers [Sat, 16 Aug 2008 03:47:16 +0000 (03:47 +0000)]
don't assume we can check for the checksums fields

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoThis really wants a rewrite
Joerg Jaspert [Sat, 16 Aug 2008 03:37:16 +0000 (05:37 +0200)]
This really wants a rewrite
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  misc fixes

16 years agomisc fixes
Mark Hymers [Sat, 16 Aug 2008 03:36:22 +0000 (03:36 +0000)]
misc fixes

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 03:22:48 +0000 (05:22 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  Actually import a module before using it.

16 years agoActually import a module before using it.
Mark Hymers [Sat, 16 Aug 2008 03:22:24 +0000 (03:22 +0000)]
Actually import a module before using it.

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 03:21:08 +0000 (05:21 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  actually check the type of basedict before trying to use it

16 years agoactually check the type of basedict before trying to use it
Mark Hymers [Sat, 16 Aug 2008 03:20:19 +0000 (03:20 +0000)]
actually check the type of basedict before trying to use it

Signed-off-by: Mark Hymers <mhy@debian.org>
16 years agoMerge commit 'mhy/checksums'
Joerg Jaspert [Sat, 16 Aug 2008 03:14:55 +0000 (05:14 +0200)]
Merge commit 'mhy/checksums'

* commit 'mhy/checksums':
  revert change to get_files_id