X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fdebianqueued-0.9%2Fdebianqueued;h=3f13a0e5c7b4aafbc6a44316f975ef10cce22cb6;hb=0075ee02039d69dce15aeff9804a82a2be1f8073;hp=78de89083fe13feff143d4c95b5569bfe629a31a;hpb=55915adf132ee756540de8e96c906d4dc1a30a2b;p=dak.git

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 78de8908..3f13a0e5 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -1327,8 +1327,9 @@ sub process_commands($) {
 						push (@thesefiles, $file);
 					}
 					for ( my($adelay)=0; $adelay <= $conf::max_delayed; $adelay++ ) {
-						if (-f $file) {
-							push (@thesefiles, $file);
+						my($dir) = sprintf( $conf::incoming_delayed, $adelay );
+						if (-f "$dir/$file") {
+							push (@thesefiles, "$dir/$file");
 						}
 				    }
 					if ($file =~ m/\.changes$/ &&  $conf::upload_method eq "copy") {
@@ -1377,7 +1378,7 @@ sub process_commands($) {
 				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\n");
+				msg( "mail,log", "$word[2]: target must be #-day with # between 0 and $conf::max_delayed (in particular, no '/' allowed)\n");
 			}
 			elsif ($word[1] =~ /$conf::keep_files/) {
 				msg( "mail,log", "$word[1] is protected, cannot rename\n" );