]> err.no Git - dak/commitdiff
Revert "Merge commit 'tomv_w/master' into merge"
authorJoerg Jaspert <joerg@debian.org>
Tue, 16 Sep 2008 06:02:41 +0000 (08:02 +0200)
committerJoerg Jaspert <joerg@debian.org>
Tue, 16 Sep 2008 06:02:41 +0000 (08:02 +0200)
This reverts commit 47384ef2b7b6c6239b41623ad8612ac7fd32d089.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
tools/debianqueued-0.9/ChangeLog
tools/debianqueued-0.9/config
tools/debianqueued-0.9/debianqueued

index 40a0890c321ae59ee7144cfef83a369f7aca0037..ddf99f2b4b053cfd6729b5d0b7235d4f1c0bebfb 100644 (file)
@@ -1,7 +1,3 @@
-2008-09-11  Thomas Viehmann  <tv@beamnet.de>
-
-       * debianqueued: Add DELAYED-support.
-
 2008-06-15  Joerg Jaspert  <joerg@debian.org>
 
        * debianqueued: Fix a brown-paper-bag bug (we just dont know who
index 155420fcf2f678728c6a4c915d143e916880c335..f2daa77ecb2e821e67dc380ad5c3bc7018b18bfb 100644 (file)
@@ -96,13 +96,6 @@ $ssh_key_file = "";
 # the incoming dir we live in
 $incoming = "/srv/queued/UploadQueue";
 
-# the delayed incoming directories
-$incoming_delayed = "/srv/queued/UploadQueue/DELAYED/%d-day";
-
-# maximum delay directory, -1 for no delayed directory,
-# incoming_delayed and target_delayed need to exist.
-$max_delayed = 9;
-
 # files not to delete in $incoming (regexp)
 $keep_files = '(status|\.message|README)$';
 
@@ -142,9 +135,6 @@ $targetlogin = "queue";
 # incoming on target host
 $targetdir = "/srv/ftp.debian.org/queue/unchecked/";
 
-# incoming/delayed on target host
-$targetdir_delayed = "/srv/queued/Incoming/DELAYED/%d-day";
-
 # select FTP debugging
 #$ftpdebug = 0;
 
index 3f13a0e5c7b4aafbc6a44316f975ef10cce22cb6..410e5716bab366c54d35d563ffcf6aade053e428 100755 (executable)
@@ -75,7 +75,7 @@
 # Revision 1.38  1998/03/23 14:03:55  ftplinux
 # In an upload failure message, say explicitly that the job will be
 # retried, to avoid confusion of users.
-# $failure_file was put on @keep_list only for first retry.
+# $failure_file was put on @keep_list only for first retry.
 # If the daemon removes a .changes, set SGID bit on all files associated
 # with it, so that the test for Debian files without a .changes doesn't
 # find them.
@@ -268,7 +268,7 @@ $junk = $conf::upload_delay_2;
 $junk = $conf::ar;
 $junk = $conf::gzip;
 $junk = $conf::cp;
-#$junk = $conf::ls;
+$junk = $conf::ls;
 $junk = $conf::chmod;
 $junk = $conf::ftpdebug;
 $junk = $conf::ftptimeout;
@@ -276,7 +276,6 @@ $junk = $conf::no_changes_timeout;
 $junk = @conf::nonus_packages;
 $junk = @conf::test_binaries;
 $junk = @conf::maintainer_mail;
-$junk = @conf::targetdir_delayed;
 $junk = $conf::mail ||= '/usr/sbin/sendmail';
 $conf::target = "localhost" if $conf::upload_method eq "copy";
 package main;
@@ -293,7 +292,7 @@ if (@ARGV == 1 && $ARGV[0] =~ /^-[rk]$/) {
 }
 
 # test for another instance of the queued already running
-my ($pid, $delayed_dirs, $adelayedcore);
+my $pid;
 if (open( PIDFILE, "<$conf::pidfile" )) {
        chomp( $pid = <PIDFILE> );
        close( PIDFILE );
@@ -319,15 +318,6 @@ if (open( PIDFILE, "<$conf::pidfile" )) {
                        unlink( "$conf::incoming/core" );
                        print "(Removed core file)\n";
                }
-               for ($delayed_dirs = 0; $delayed_dirs <= $conf::max_delayed; 
-                        $delayed_dirs++) {
-                       $adelayedcore = sprintf( "$conf::incoming_delayed/core",
-                                                                        $delayed_dirs );
-                       if (-e $adelayedcore) {
-                               unlink( $adelayedcore );
-                               print "(Removed core file)\n";
-                       }
-               }
                exit 0 if $main::arg eq "kill";
        }
        else {
@@ -403,14 +393,6 @@ die "Bad upload method '$conf::upload_method'.\n"
 die "No keyrings\n" if ! @conf::keyrings;
 
 }
-die "statusfile path must be absolute."
-       if $conf::statusfile !~ m,^/,;
-die "upload and target queue paths must be absolute."
-       if $conf::incoming !~ m,^/, ||
-          $conf::incoming_delayed !~ m,^/, ||
-          $conf::targetdir !~ m,^/, ||
-          $conf::targetdir_delayed !~ m,^/,;
-
 
 # ---------------------------------------------------------------------------
 #                                                         initializations
@@ -419,12 +401,9 @@ die "upload and target queue paths must be absolute."
 # prototypes
 sub calc_delta();
 sub check_dir();
-sub get_filelist_from_known_good_changes($);
-sub age_delayed_queues();
 sub process_changes($\@);
 sub process_commands($);
-sub age_delayed_queues();
-sub is_on_target($\@);
+sub is_on_target($);
 sub copy_to_target(@);
 sub pgp_check($);
 sub check_alive(;$);
@@ -583,10 +562,6 @@ kill( $main::signo{"USR1"}, $parent_pid );
 #                                                               the mainloop
 # ---------------------------------------------------------------------------
 
-# default to classical incoming/target
-$main::current_incoming = $conf::incoming;
-$main::current_targetdir = $conf::targetdir;
-
 $main::dstat = "i";
 write_status_file() if $conf::statusdelay;
 while( 1 ) {
@@ -594,13 +569,6 @@ while( 1 ) {
        # ping target only if there is the possibility that we'll contact it (but
        # also don't wait too long).
        my @have_changes = <*.changes *.commands>;
-       for ( my $delayed_dirs = 0; $delayed_dirs <= $conf::max_delayed; 
-                 $delayed_dirs++) {
-               my $adelayeddir = sprintf( "$conf::incoming_delayed",
-                                                                  $delayed_dirs );
-               push( @have_changes,
-                         <$adelayeddir/*.changes> );
-       }
        check_alive() if @have_changes || (time - $main::last_ping_time) > 8*60*60;
 
        if (@have_changes && $main::target_up) {
@@ -610,10 +578,6 @@ while( 1 ) {
        $main::dstat = "i";
        write_status_file() if $conf::statusdelay;
 
-       if ($conf::upload_method eq "copy") {
-               age_delayed_queues();
-       }
-
        # sleep() returns if we received a signal (SIGUSR1 for status FIFO), so
        # calculate the end time once and wait for it being reached.
        format_status_num( $main::next_run, time + $conf::queue_delay );
@@ -650,8 +614,7 @@ sub calc_delta() {
 # main function for checking the incoming dir
 #
 sub check_dir() {
-       my( @files, @changes, @keep_files, @this_keep_files, @stats, $file ,
-               $adelay );
+       my( @files, @changes, @keep_files, @this_keep_files, @stats, $file );
        
        debug( "starting checkdir" );
        $main::dstat = "c";
@@ -667,191 +630,133 @@ sub check_dir() {
                msg( "log", "binary test failed for $_; delaying queue run\n");
                goto end_run;
        }
-
-       for ( $adelay=-1; $adelay <= $conf::max_delayed; $adelay++ ) {
-               if ( $adelay == -1 ) {
-                       $main::current_incoming = $conf::incoming;
-                       $main::current_incoming_short = "";
-                       $main::current_targetdir = $conf::targetdir;
-               }
-               else {
-                       $main::current_incoming = sprintf( $conf::incoming_delayed,
-                                                                                          $adelay );
-                       $main::current_incoming_short = sprintf( "DELAYED/%d-day",
-                                                                                                        $adelay );
-                       $main::current_targetdir = sprintf( $conf::targetdir_delayed,
-                                                                                               $adelay );
-               }
-
-               # need to clear directory specific variables
-               undef ( @keep_files );
-               undef ( @this_keep_files );
-
-               chdir ( $main::current_incoming )
-                       or (msg( "log",
-                                        "Cannot change to dir ".
-                                        "${main::current_incoming_short}: $!\n" ),
-                               return);
-
-               # look for *.commands files but not in delayed queues
-               if ( $adelay==-1 ) {
-                       foreach $file ( <*.commands> ) {
-                               init_mail( $file );
-                               block_signals();
-                               process_commands( $file );
-                               unblock_signals();
-                               $main::dstat = "c";
-                               write_status_file() if $conf::statusdelay;
-                               finish_mail();
-                       }
-               }
-               opendir( INC, "." )
-                       or (msg( "log", "Cannot open dir ${main::current_incoming_short}: $!\n" ),
-                               return);
-               @files = readdir( INC );
-               closedir( INC );
-
-               # process all .changes files found
-               @changes = grep /\.changes$/, @files;
-               push( @keep_files, @changes ); # .changes files aren't stray
-               foreach $file ( @changes ) {
-                       init_mail( $file );
-                       # wrap in an eval to allow jumpbacks to here with die in case
-                       # of errors
-                       block_signals();
-                       eval { process_changes( $file, @this_keep_files ); };
-                       unblock_signals();
-                       msg( "log,mail", $@ ) if $@;
-                       $main::dstat = "c";
-                       write_status_file() if $conf::statusdelay;
+       
+       # look for *.commands files
+       foreach $file ( <*.commands> ) {
+               init_mail( $file );
+               block_signals();
+               process_commands( $file );
+               unblock_signals();
+               $main::dstat = "c";
+               write_status_file() if $conf::statusdelay;
+               finish_mail();
+       }
+       
+       opendir( INC, "." )
+               or (msg( "log", "Cannot open incoming dir $conf::incoming: $!\n" ),
+                       return);
+       @files = readdir( INC );
+       closedir( INC );
+
+       # process all .changes files found
+       @changes = grep /\.changes$/, @files;
+       push( @keep_files, @changes ); # .changes files aren't stray
+       foreach $file ( @changes ) {
+               init_mail( $file );
+               # wrap in an eval to allow jumpbacks to here with die in case
+               # of errors
+               block_signals();
+               eval { process_changes( $file, @this_keep_files ); };
+               unblock_signals();
+               msg( "log,mail", $@ ) if $@;
+               $main::dstat = "c";
+               write_status_file() if $conf::statusdelay;
                
-                       # files which are ok in conjunction with this .changes
-                       debug( "$file tells to keep @this_keep_files" );
-                       push( @keep_files, @this_keep_files );
-                       finish_mail();
+               # files which are ok in conjunction with this .changes
+               debug( "$file tells to keep @this_keep_files" );
+               push( @keep_files, @this_keep_files );
+               finish_mail();
 
-                       # break out of this loop if the incoming dir has become unwritable
-                       goto end_run if !$main::incoming_writable;
-               }
-               ftp_close() if $conf::upload_method eq "ftp";
+               # break out of this loop if the incoming dir has become unwritable
+               goto end_run if !$main::incoming_writable;
+       }
+       ftp_close() if $conf::upload_method eq "ftp";
 
-               # find files which aren't related to any .changes
-               foreach $file ( @files ) {
-                       # filter out files we never want to delete
-                       next if ! -f $file ||   # may have disappeared in the meantime
+       # find files which aren't related to any .changes
+       foreach $file ( @files ) {
+               # filter out files we never want to delete
+               next if ! -f $file ||   # may have disappeared in the meantime
                            $file eq "." || $file eq ".." ||
                            (grep { $_ eq $file } @keep_files) ||
                                $file =~ /$conf::keep_files/;
-                       # Delete such files if they're older than
-                       # $stray_remove_timeout; they could be part of an
-                       # yet-incomplete upload, with the .changes still missing.
-                       # Cannot send any notification, since owner unknown.
-                       next if !(@stats = stat( $file ));
-                       my $age = time - $stats[ST_MTIME];
-                       my( $maint, $pattern, @job_files );
-                       if ($file =~ /^junk-for-writable-test/ ||
-                               $file !~ m,$conf::valid_files, ||
-                               $age >= $conf::stray_remove_timeout) {
-                               msg( "log", "Deleted stray file ${main::current_incoming_short}/$file\n" ) if rm( $file );
+               # Delete such files if they're older than
+               # $stray_remove_timeout; they could be part of an
+               # yet-incomplete upload, with the .changes still missing.
+               # Cannot send any notification, since owner unknown.
+               next if !(@stats = stat( $file ));
+               my $age = time - $stats[ST_MTIME];
+               my( $maint, $pattern, @job_files );
+               if ($file =~ /^junk-for-writable-test/ ||
+                       $file !~ m,$conf::valid_files, ||
+                       $age >= $conf::stray_remove_timeout) {
+                       msg( "log", "Deleted stray file $file\n" ) if rm( $file );
+               }
+               elsif ($age > $conf::no_changes_timeout &&
+                          is_debian_file( $file ) &&
+                          # not already reported
+                          !($stats[ST_MODE] & S_ISGID) &&
+                          ($pattern = debian_file_stem( $file )) &&
+                          (@job_files = glob($pattern)) &&
+                          # If a .changes is in the list, it has the same stem as the
+                          # found file (probably a .orig.tar.gz). Don't report in this
+                          # case.
+                          !(grep( /\.changes$/, @job_files ))) {
+                       $maint = get_maintainer( $file );
+                       # Don't send a mail if this looks like the recompilation of a
+                       # package for a non-i386 arch. For those, the maintainer field is
+                       # useless :-(
+                       if (!grep( /(\.dsc|_(i386|all)\.deb)$/, @job_files )) {
+                               msg( "log", "Found an upload without .changes and with no ",
+                                               ".dsc file\n" );
+                               msg( "log", "Not sending a report, because probably ",
+                                               "recompilation job\n" );
                        }
-                       elsif ($age > $conf::no_changes_timeout &&
-                                  is_debian_file( $file ) &&
-                                  # not already reported
-                                  !($stats[ST_MODE] & S_ISGID) &&
-                                  ($pattern = debian_file_stem( $file )) &&
-                                  (@job_files = glob($pattern)) &&
-                                  # If a .changes is in the list, it has the same stem as the
-                                  # found file (probably a .orig.tar.gz). Don't report in this
-                                  # case.
-                                  !(grep( /\.changes$/, @job_files ))) {
-                               $maint = get_maintainer( $file );
-                               # Don't send a mail if this looks like the recompilation of a
-                               # package for a non-i386 arch. For those, the maintainer field is
-                               # useless :-(
-                               if (!grep( /(\.dsc|_(i386|all)\.deb)$/, @job_files )) {
-                                       msg( "log", "Found an upload without .changes and with no ",
-                                                       ".dsc file\n" );
-                                       msg( "log", "Not sending a report, because probably ",
-                                                       "recompilation job\n" );
-                               }
-                               elsif ($maint) {
-                                       init_mail();
-                                       $main::mail_addr = $maint;
-                                       $main::mail_addr = $1 if $main::mail_addr =~ /<([^>]*)>/;
-                                       $main::mail_subject = "Incomplete upload found in ".
-                                                                 "Debian upload queue";
-                                       msg( "mail", "Probably you are the uploader of the following ".
-                                                                "file(s) in\n" );
-                                       msg( "mail", "the Debian upload queue directory:\n  " );
-                                       msg( "mail", join( "\n  ", @job_files ), "\n" );
-                                       msg( "mail", "This looks like an upload, but a .changes file ".
-                                                                "is missing, so the job\n" );
-                                       msg( "mail", "cannot be processed.\n\n" );
-                                       msg( "mail", "If no .changes file arrives within ",
-                                                                print_time( $conf::stray_remove_timeout - $age ),
-                                                                ", the files will be deleted.\n\n" );
-                                       msg( "mail", "If you didn't upload those files, please just ".
-                                                                "ignore this message.\n" );
-                                       finish_mail();
-                                       msg( "log", "Sending problem report for an upload without a ".
-                                                               ".changes\n" );
-                                       msg( "log", "Maintainer: $maint\n" );
-                               }
-                               else {
-                                       msg( "log", "Found an upload without .changes, but can't ".
-                                                               "find a maintainer address\n" );
-                               }
-                               msg( "log", "Files: @job_files\n" );
-                               # remember we already have sent a mail regarding this file
-                               foreach ( @job_files ) {
-                                       my @st = stat($_);
-                                       next if !@st; # file may have disappeared in the meantime
-                                       chmod +($st[ST_MODE] |= S_ISGID), $_;
-                               }
+                       elsif ($maint) {
+                               init_mail();
+                               $main::mail_addr = $maint;
+                               $main::mail_addr = $1 if $main::mail_addr =~ /<([^>]*)>/;
+                               $main::mail_subject = "Incomplete upload found in ".
+                                                                         "Debian upload queue";
+                               msg( "mail", "Probably you are the uploader of the following ".
+                                                        "file(s) in\n" );
+                               msg( "mail", "the Debian upload queue directory:\n  " );
+                               msg( "mail", join( "\n  ", @job_files ), "\n" );
+                               msg( "mail", "This looks like an upload, but a .changes file ".
+                                                        "is missing, so the job\n" );
+                               msg( "mail", "cannot be processed.\n\n" );
+                               msg( "mail", "If no .changes file arrives within ",
+                                                        print_time( $conf::stray_remove_timeout - $age ),
+                                                        ", the files will be deleted.\n\n" );
+                               msg( "mail", "If you didn't upload those files, please just ".
+                                                        "ignore this message.\n" );
+                               finish_mail();
+                               msg( "log", "Sending problem report for an upload without a ".
+                                                       ".changes\n" );
+                               msg( "log", "Maintainer: $maint\n" );
                        }
                        else {
-                               debug( "found stray file ${main::current_incoming_short}/$file, deleting in ",
-                                          print_time($conf::stray_remove_timeout - $age) );
+                               msg( "log", "Found an upload without .changes, but can't ".
+                                                       "find a maintainer address\n" );
+                       }
+                       msg( "log", "Files: @job_files\n" );
+                       # remember we already have sent a mail regarding this file
+                       foreach ( @job_files ) {
+                               my @st = stat($_);
+                               next if !@st; # file may have disappeared in the meantime
+                               chmod +($st[ST_MODE] |= S_ISGID), $_;
                        }
                }
+               else {
+                       debug( "found stray file $file, deleting in ",
+                                  print_time($conf::stray_remove_timeout - $age) );
+               }
        }
-       chdir( $conf::incoming );
 
   end_run:
        $main::dstat = "i";
        write_status_file() if $conf::statusdelay;
 }
 
-sub get_filelist_from_known_good_changes($) {
-       my $changes = shift;
-
-       local( *CHANGES );
-       my(@filenames);
-
-       # parse the .changes file
-       open( CHANGES, "<$changes" )
-               or die "$changes: $!\n";
-       outer_loop: while( <CHANGES> ) {
-               if (/^Files:/i) {
-                       while( <CHANGES> ) {
-                               redo outer_loop if !/^\s/;
-                               my @field = split( /\s+/ );
-                               next if @field != 6;
-                               # forbid shell meta chars in the name, we pass it to a
-                               # subshell several times...
-                               $field[5] =~ /^([a-zA-Z0-9.+_:@=%-][~a-zA-Z0-9.+_:@=%-]*)/;
-                               if ($1 ne $field[5]) {
-                                       msg( "log", "found suspicious filename $field[5]\n" );
-                                       next;
-                               }
-                               push( @filenames, $field[5] );
-                       }
-               }
-       }
-       close( CHANGES );
-       return @filenames;
-}
-
 #
 # process one .changes file
 #
@@ -864,16 +769,16 @@ sub process_changes($\@) {
        local( *CHANGES );
        local( *FAILS );
 
-       format_status_str( $main::current_changes, "$main::current_incoming_short/$changes" );
+       format_status_str( $main::current_changes, $changes );
        $main::dstat = "c";
        write_status_file() if $conf::statusdelay;
 
        @$keep_list = ();
-       msg( "log", "processing ${main::current_incoming_short}/$changes\n" );
+       msg( "log", "processing $changes\n" );
 
        # parse the .changes file
        open( CHANGES, "<$changes" )
-               or die "Cannot open ${main::current_incoming_short}/$changes: $!\n";
+               or die "Cannot open $changes: $!\n";
        $pgplines = 0;
        $main::mail_addr = "";
        @files = ();
@@ -900,7 +805,7 @@ sub process_changes($\@) {
                                $field[5] =~ /^([a-zA-Z0-9.+_:@=%-][~a-zA-Z0-9.+_:@=%-]*)/;
                                if ($1 ne $field[5]) {
                                        msg( "log", "found suspicious filename $field[5]\n" );
-                                       msg( "mail", "File '$field[5]' mentioned in $main::current_incoming_short/$changes\n",
+                                       msg( "mail", "File '$field[5]' mentioned in $changes\n",
                                                 "has bad characters in its name. Removed.\n" );
                                        rm( $field[5] );
                                        next;
@@ -922,7 +827,7 @@ sub process_changes($\@) {
 
        # some consistency checks
        if (!$main::mail_addr) {
-               msg( "log,mail", "$main::current_incoming_short/$changes doesn't contain a Maintainer: field; ".
+               msg( "log,mail", "$changes doesn't contain a Maintainer: field; ".
                         "cannot process\n" );
                goto remove_only_changes;
        }
@@ -944,25 +849,25 @@ sub process_changes($\@) {
                        # not found or not unique: hold the job and inform queue maintainer
                        my $old_addr = $main::mail_addr;
                        $main::mail_addr = $conf::maintainer_mail;
-                       msg( "mail", "The job ${main::current_incoming_short}/$changes doesn't have a correct email\n" );
-                   msg( "mail", "address in the Maintainer: field:\n" );
+                       msg( "mail", "The job $changes doesn't have a correct email\n" );
+                       msg( "mail", "address in the Maintainer: field:\n" );
                        msg( "mail", "  $old_addr\n" );
                        msg( "mail", "A check for this in the Debian keyring gave:\n" );
                        msg( "mail", @addr_list ?
                                                 "  " . join( ", ", @addr_list ) . "\n" :
                                                 "  nothing\n" );
                        msg( "mail", "Please fix this manually\n" );
-                       msg( "log", "Bad Maintainer: field in ${main::current_incoming_short}/$changes: $old_addr\n" );
+                       msg( "log", "Bad Maintainer: field in $changes: $old_addr\n" );
                        goto remove_only_changes;
                }
        }
        if ($pgplines < 3) {
-               msg( "log,mail", "$main::current_incoming_short/$changes isn't signed with PGP/GnuPG\n" );
+               msg( "log,mail", "$changes isn't signed with PGP/GnuPG\n" );
                msg( "log", "(uploader $main::mail_addr)\n" );
                goto remove_only_changes;
        }
        if (!@files) {
-               msg( "log,mail", "$main::current_incoming_short/$changes doesn't mention any files\n" );
+               msg( "log,mail", "$changes doesn't mention any files\n" );
                msg( "log", "(uploader $main::mail_addr)\n" );
                goto remove_only_changes;
        }
@@ -983,7 +888,7 @@ sub process_changes($\@) {
        $retries = $last_retry = 0;
        if (-f $failure_file) {
                open( FAILS, "<$failure_file" )
-                       or die "Cannot open $main::current_incoming_short/$failure_file: $!\n";
+                       or die "Cannot open $failure_file: $!\n";
                my $line = <FAILS>;
                close( FAILS );
                ( $retries, $last_retry ) = ( $1, $2 ) if $line =~ /^(\d+)\s+(\d+)$/;
@@ -992,10 +897,10 @@ sub process_changes($\@) {
 
        # run PGP on the file to check the signature
        if (!($signator = pgp_check( $changes ))) {
-               msg( "log,mail", "$main::current_incoming_short/$changes has bad PGP/GnuPG signature!\n" );
+               msg( "log,mail", "$changes has bad PGP/GnuPG signature!\n" );
                msg( "log", "(uploader $main::mail_addr)\n" );
          remove_only_changes:
-               msg( "log,mail", "Removing $main::current_incoming_short/$changes, but keeping its associated ",
+               msg( "log,mail", "Removing $changes, but keeping its associated ",
                                     "files for now.\n" );
                rm( $changes );
                # Set SGID bit on associated files, so that the test for Debian files
@@ -1010,11 +915,11 @@ sub process_changes($\@) {
        elsif ($signator eq "LOCAL ERROR") {
                # An error has appened when starting pgp... Don't process the file,
                # but also don't delete it
-               debug( "Can't PGP/GnuPG check $main::current_incoming_short/$changes -- don't process it for now" );
+               debug( "Can't PGP/GnuPG check $changes -- don't process it for now" );
                return;
        }
 
-       die "Cannot stat ${main::current_incoming_short}/$changes (??): $!\n"
+       die "Cannot stat $changes (??): $!\n"
                if !(@changes_stats = stat( $changes ));
        # Make $upload_time the maximum of all modification times of files
        # related to this .changes (and the .changes it self). This is the
@@ -1076,7 +981,7 @@ sub process_changes($\@) {
                        # if a .changes fails for a really long time (several days
                        # or so), remove it and all associated files
                        msg( "log,mail",
-                                "$main::current_incoming_short/$changes couldn't be processed for ",
+                                "$changes couldn't be processed for ",
                                 int($conf::bad_changes_timeout/(60*60)),
                                 " hours and is now deleted\n" );
                        msg( "log,mail",
@@ -1115,8 +1020,8 @@ sub process_changes($\@) {
        # check if the job is already present on target
        # (moved to here, to avoid bothering target as long as there are errors in
        # the job)
-       if ($ls_l = is_on_target( $changes, @filenames )) {
-               msg( "log,mail", "$main::current_incoming_short/$changes is already present on target host:\n" );
+       if ($ls_l = is_on_target( $changes )) {
+               msg( "log,mail", "$changes is already present on target host:\n" );
                msg( "log,mail", "$ls_l\n" );
                msg( "mail", "Either you already uploaded it, or someone else ",
                                 "came first.\n" );
@@ -1213,17 +1118,16 @@ sub process_commands($) {
        my $commands = shift;
        my( @cmds, $cmd, $pgplines, $signator );
        local( *COMMANDS );
-       my( @files, $file, @removed, $target_delay );
        
        format_status_str( $main::current_changes, $commands );
        $main::dstat = "c";
        write_status_file() if $conf::statusdelay;
        
-       msg( "log", "processing $main::current_incoming_short/$commands\n" );
+       msg( "log", "processing $commands\n" );
 
        # parse the .commands file
        if (!open( COMMANDS, "<$commands" )) {
-               msg( "log", "Cannot open $main::current_incoming_short/$commands: $!\n" );
+               msg( "log", "Cannot open $commands: $!\n" );
                return;
        }
        $pgplines = 0;
@@ -1255,16 +1159,16 @@ sub process_commands($) {
        
        # some consistency checks
        if (!$main::mail_addr || $main::mail_addr !~ /^\S+\@\S+\.\S+/) {
-               msg( "log,mail", "$main::current_incoming_short/$commands contains no or bad Uploader: field: ".
+               msg( "log,mail", "$commands contains no or bad Uploader: field: ".
                                                 "$main::mail_addr\n" );
-               msg( "log,mail", "cannot process $main::current_incoming_short/$commands\n" );
+               msg( "log,mail", "cannot process $commands\n" );
                $main::mail_addr = "";
                goto remove;
        }
        msg( "log", "(command uploader $main::mail_addr)\n" );
 
        if ($pgplines < 3) {
-               msg( "log,mail", "$main::current_incoming_short/$commands isn't signed with PGP/GnuPG\n" );
+               msg( "log,mail", "$commands isn't signed with PGP/GnuPG\n" );
                msg( "mail", "or the uploaded file is broken. Make sure to transfer in binary mode\n" );
                msg( "mail", "or better yet - use dcut for commands files\n");
                goto remove;
@@ -1272,79 +1176,45 @@ sub process_commands($) {
        
        # run PGP on the file to check the signature
        if (!($signator = pgp_check( $commands ))) {
-               msg( "log,mail", "$main::current_incoming_short/$commands has bad PGP/GnuPG signature!\n" );
+               msg( "log,mail", "$commands has bad PGP/GnuPG signature!\n" );
          remove:
-               msg( "log,mail", "Removing $main::current_incoming_short/$commands\n" );
+               msg( "log,mail", "Removing $commands\n" );
                rm( $commands );
                return;
        }
        elsif ($signator eq "LOCAL ERROR") {
                # An error has appened when starting pgp... Don't process the file,
                # but also don't delete it
-               debug( "Can't PGP/GnuPG check $main::current_incoming_short/$commands -- don't process it for now" );
+               debug( "Can't PGP/GnuPG check $commands -- don't process it for now" );
                return;
        }
        msg( "log", "(PGP/GnuPG signature by $signator)\n" );
 
        # now process commands
-       msg( "mail", "Log of processing your commands file $main::current_incoming_short/$commands:\n\n" );
+       msg( "mail", "Log of processing your commands file $commands:\n\n" );
        foreach $cmd ( @cmds ) {
                my @word = split( /\s+/, $cmd );
                msg( "mail,log", "> @word\n" );
                next if @word < 1;
                
                if ($word[0] eq "rm") {
+                       my( @files, $file, @removed );
                        foreach ( @word[1..$#word] ) {
                                if (m,/,) {
                                        msg( "mail,log", "$_: filename may not contain slashes\n" );
                                }
                                elsif (/[*?[]/) {
-                                       # process wildcards but also plain names (for delayed target removal)
-                                       my (@thesefiles);
+                                       # process wildcards
                                        my $pat = quotemeta($_);
                                        $pat =~ s/\\\*/.*/g;
                                        $pat =~ s/\\\?/.?/g;
                                        $pat =~ s/\\([][])/$1/g;
                                        opendir( DIR, "." );
-                                       push (@thesefiles, grep /^$pat$/, readdir(DIR) );
+                                       push( @files, grep /^$pat$/, readdir(DIR) );
                                        closedir( DIR );
-                                       for ( my($adelay)=0; (! @thesefiles) && $adelay <= $conf::max_delayed; $adelay++ ) {
-                                               my($dir) = sprintf( $conf::incoming_delayed,
-                                                                   $adelay );
-                                               opendir( DIR, "$dir" );
-                                               push( @thesefiles, map ("$dir/$_", grep /^$pat$/, readdir(DIR) ));
-                                               closedir( DIR );
-                                       }
-                                       push (@files, @thesefiles);
-                                       if (! @thesefiles) {
-                                               msg( "mail,log", "$_ did not match anything\n" );
-                                       }
                                }
                                else {
-                                   my (@thesefiles);
-                                   $file = $_;
-                                   if (-f $file) {
-                                               push (@thesefiles, $file);
-                                       }
-                                       for ( my($adelay)=0; $adelay <= $conf::max_delayed; $adelay++ ) {
-                                               my($dir) = sprintf( $conf::incoming_delayed, $adelay );
-                                               if (-f "$dir/$file") {
-                                                       push (@thesefiles, "$dir/$file");
-                                               }
-                                   }
-                                       if ($file =~ m/\.changes$/ &&  $conf::upload_method eq "copy") {
-                                               for ( my($adelay)=0; $adelay <= $conf::max_delayed; $adelay++ ) {
-                                                       my($dir) = sprintf( "$conf::targetdir_delayed",$adelay );
-                                                       if (-f "$dir/$file") {
-                                                               push (@thesefiles, "$dir/$file");
-                                                               push (@thesefiles, map( "$dir/$_",get_filelist_from_known_good_changes("$dir/$file")));
-                                                       }
-                                               }
-                                       }
-                                       if (!@thesefiles) {
-                                               msg( "mail,log", "No file found: $file\n" );
-                                       }
-                                       push (@files, @thesefiles);
+                                       push( @files, $_ );
                                }
                        }
                        if (!@files) {
@@ -1374,39 +1244,27 @@ sub process_commands($) {
                        if (@word != 3) {
                                msg( "mail,log", "Wrong number of arguments\n" );
                        }
-                       elsif ($word[1] =~ m,/, || $word[1] !~ m/\.changes/) {
+                       elsif ($word[1] =~ m,/,) {
                                msg( "mail,log", "$word[1]: filename may not contain slashes\n" );
                        }
-                       elsif (! (($target_delay) = $word[2] =~ m,^([0-9]+)-day$,) || $target_delay > $conf::max_delayed) {
-                               msg( "mail,log", "$word[2]: target must be #-day with # between 0 and $conf::max_delayed (in particular, no '/' allowed)\n");
+                       elsif ($word[2] =~ m,/,) {
+                               msg( "mail,log", "$word[2]: filename may not contain slashes\n" );
+                       }
+                       elsif (!-f $word[1]) {
+                               msg( "mail,log", "$word[1]: no such file\n" );
+                       }
+                       elsif (-e $word[2]) {
+                               msg( "mail,log", "$word[2]: file exists\n" );
                        }
                        elsif ($word[1] =~ /$conf::keep_files/) {
                                msg( "mail,log", "$word[1] is protected, cannot rename\n" );
                        }
                        else {
-                               my($adelay);
-                               for ( $adelay=0; $adelay <= $conf::max_delayed && ! -f (sprintf( "$conf::targetdir_delayed",$adelay )."/$word[1]"); $adelay++ ) {
-                               }
-                               if ( $adelay > $conf::max_delayed) {
-                                       msg( "mail,log", "$word[1] not found\n" );
-                               }
-                               elsif ($adelay == $target_delay) {
-                                       msg( "mail,log", "$word[1] already is in $word[2]\n" );
+                               if (!rename( $word[1], $word[2] )) {
+                                       msg( "mail,log", "rename: $!\n" );
                                }
                                else {
-                                       my(@thesefiles);
-                                       my($dir) = sprintf( "$conf::targetdir_delayed",$adelay );
-                                       my($target_dir) = sprintf( "$conf::targetdir_delayed",$target_delay );
-                                       push (@thesefiles, $word[1]);
-                                       push (@thesefiles, get_filelist_from_known_good_changes("$dir/$word[1]"));
-                                       for my $afile(@thesefiles) {
-                                               if (! rename "$dir/$afile","$target_dir/$afile") {
-                                                       msg( "mail,log", "rename: $!\n" );
-                                               }
-                                               else {
-                                                       msg( "mail,log", "$afile moved to $target_delay-day\n" );
-                                               }
-                                       }
+                                       msg( "mail,log", "OK\n" );
                                }
                        }
                }
@@ -1415,47 +1273,17 @@ sub process_commands($) {
                }
        }
        rm( $commands );
-       msg( "log", "-- End of $main::current_incoming_short/$commands processing\n" );
-}
-
-sub age_delayed_queues() {
-       for ( my($adelay)=0 ; $adelay <= $conf::max_delayed ; $adelay++ ) {
-               my($dir) = sprintf( "$conf::targetdir_delayed",$adelay );
-               my($target_dir);
-               if ($adelay == 0) {
-                   $target_dir = $conf::targetdir;
-               }
-               else {
-                       $target_dir = sprintf( "$conf::targetdir_delayed",$adelay-1 );
-               }
-               for my $achanges (<$dir/*.changes>) {
-                       my $mtime = (stat($achanges))[9];
-                       if ($mtime + 24*60*60 <= time) {
-                               utime undef,undef,($achanges);
-                               my @thesefiles = ($achanges =~ m,.*/([^/]*),);
-                               push (@thesefiles, get_filelist_from_known_good_changes($achanges));
-                               for my $afile(@thesefiles) {
-                                       if (! rename "$dir/$afile","$target_dir/$afile") {
-                                               msg( "log", "rename: $!\n" );
-                                       }
-                                       else {
-                                               msg( "log", "$afile moved to $target_dir\n" );
-                                       }
-                               }
-                       }
-               }
-       }
+       msg( "log", "-- End of $commands processing\n" );
 }
 
 #
 # check if a file is already on target
 #
-sub is_on_target($\@) {
+sub is_on_target($) {
        my $file = shift;
-       my $filelist = shift;
        my $msg;
        my $stat;
-
+       
        if ($conf::upload_method eq "ssh") {
                ($msg, $stat) = ssh_cmd( "ls -l $file" );
        }
@@ -1476,24 +1304,7 @@ sub is_on_target($\@) {
                }
        }
        else {
-               my @allfiles = ($file);
-               push ( @allfiles, @$filelist);
-               $stat = 1;
-               $msg = "no such file";
-               for my $afile(@allfiles) {
-                       if (-f "$conf::incoming/$afile") {
-                               $stat = 0;
-                   $msg = "$afile";
-                       }
-               }
-               for ( my($adelay)=0 ; $adelay <= $conf::max_delayed && $stat ; $adelay++ ) {
-                       for my $afile(@allfiles) {
-                               if (-f (sprintf( "$conf::targetdir_delayed",$adelay )."/$afile")) {
-                                       $stat = 0;
-                                       $msg = sprintf( "%d-day",$adelay )."/$afile";
-                               }
-                       }
-               }
+               ($msg, $stat) = local_cmd( "$conf::ls -l $file" );
        }
        chomp( $msg );
        debug( "exit status: $stat, output was: $msg" );
@@ -1524,17 +1335,13 @@ sub copy_to_target(@) {
        }
        elsif ($conf::upload_method eq "ftp") {
                my($rv, $file);
-               if (!$main::FTP_chan->cwd( $main::current_targetdir )) {
-                       msg( "log,mail", "Can't cd to $main::current_targetdir on $conf::target\n" );
-                       goto err;
-               }
                foreach $file (@files) {
                        ($rv, $msgs) = ftp_cmd( "put", $file );
                        goto err if !$rv;
                }
        }
        else {
-               ($msgs, $stat) = local_cmd( "$conf::cp @files $main::current_targetdir", 'NOCD' );
+               ($msgs, $stat) = local_cmd( "$conf::cp @files $conf::targetdir", 'NOCD' );
                goto err if $stat;
        }
        
@@ -1656,7 +1463,7 @@ sub copy_to_target(@) {
                }
        }
        else {
-               my @tfiles = map { "$main::current_targetdir/$_" } @files;
+               my @tfiles = map { "$conf::targetdir/$_" } @files;
                debug( "executing unlink(@tfiles)" );
                rm( @tfiles );
        }
@@ -1675,7 +1482,7 @@ sub pgp_check($) {
        my $found = 0;
        my $stat;
        local( *PIPE );
-
+       
        $stat = 1;
        if (-x $conf::gpg) {
                debug( "executing $conf::gpg --no-options --batch ".
@@ -1912,7 +1719,7 @@ sub ftp_open() {
 
        if ($main::FTP_chan) {
                # is already open, but might have timed out; test with a cwd
-               return $main::FTP_chan if $main::FTP_chan->cwd( $main::current_targetdir );
+               return $main::FTP_chan if $main::FTP_chan->cwd( $conf::targetdir );
                # cwd didn't work, channel is closed, try to reopen it
                $main::FTP_chan = undef;
        }
@@ -1931,8 +1738,8 @@ sub ftp_open() {
                msg( "log,mail", "Can't set binary FTP mode on $conf::target\n" );
                goto err;
        }
-       if (!$main::FTP_chan->cwd( $main::current_targetdir )) {
-               msg( "log,mail", "Can't cd to $main::current_targetdir on $conf::target\n" );
+       if (!$main::FTP_chan->cwd( $conf::targetdir )) {
+               msg( "log,mail", "Can't cd to $conf::targetdir on $conf::target\n" );
                goto err;
        }
        debug( "opened FTP channel to $conf::target" );
@@ -1995,7 +1802,7 @@ sub ssh_cmd($) {
        my ($msg, $stat);
 
        my $ecmd = "$conf::ssh $conf::ssh_options $conf::target ".
-                          "-l $conf::targetlogin \'cd $main::current_targetdir; $cmd\'";
+                          "-l $conf::targetlogin \'cd $conf::targetdir; $cmd\'";
        debug( "executing $ecmd" );
        $SIG{"ALRM"} = sub { die "timeout in ssh command\n" } ;
        alarm( $conf::remote_timeout );
@@ -2015,7 +1822,7 @@ sub scp_cmd(@) {
        my ($msg, $stat);
 
        my $ecmd = "$conf::scp $conf::ssh_options @_ ".
-                          "$conf::targetlogin\@$conf::target:$main::current_targetdir";
+                          "$conf::targetlogin\@$conf::target:$conf::targetdir";
        debug( "executing $ecmd" );
        $SIG{"ALRM"} = sub { die "timeout in scp\n" } ;
        alarm( $conf::remote_timeout );
@@ -2036,7 +1843,7 @@ sub local_cmd($;$) {
        my $nocd = shift;
        my ($msg, $stat);
 
-       my $ecmd = ($nocd ? "" : "cd $main::current_targetdir; ") . $cmd;
+       my $ecmd = ($nocd ? "" : "cd $conf::targetdir; ") . $cmd;
        debug( "executing $ecmd" );
        $msg = `($ecmd) 2>&1`;
        $stat = $?;