X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tools%2Fdebianqueued-0.9%2Fdebianqueued;h=0ead31ccc7049683dba0c95719b4b1722438f5a3;hb=b20b1d58b688bebb896144c6a4c10ed7fb37fe2b;hp=4d2daa093ee72dbb37662c56637a6df06b5a3ba3;hpb=bfa8728e72eee4471a690da79c86efeba893218a;p=dak.git diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued index 4d2daa09..0ead31cc 100755 --- a/tools/debianqueued-0.9/debianqueued +++ b/tools/debianqueued-0.9/debianqueued @@ -490,6 +490,7 @@ sub check_dir() { # look for *.commands and *.dak-commands files but not in delayed queues if ( $adelay == -1 ) { foreach $file (<*.commands>) { + next unless $file =~ /$re_file_safe/; init_mail($file); block_signals(); process_commands($file); @@ -499,6 +500,7 @@ sub check_dir() { finish_mail(); } ## end foreach $file (<*.commands>) foreach $file (<*.dak-commands>) { + next unless $file =~ /$re_file_safe/; init_mail($file); block_signals(); process_dak_commands($file); @@ -522,6 +524,7 @@ sub check_dir() { @changes = grep /\.changes$/, @files; push( @keep_files, @changes ); # .changes files aren't stray foreach $file (@changes) { + next unless $file =~ /$re_file_safe/; init_mail($file); # wrap in an eval to allow jumpbacks to here with die in case @@ -562,6 +565,7 @@ sub check_dir() { my ( $maint, $pattern, @job_files ); if ( $file =~ /^junk-for-writable-test/ || $file !~ m,$conf::valid_files, + || $file !~ /$re_file_safe/ || $age >= $conf::stray_remove_timeout ) { msg( "log", @@ -2130,9 +2134,10 @@ sub rm(@) { # sub md5sum($) { my $file = shift; + my $md5 = Digest::MD5->new; open my $fh, "<", $file or return ""; - my $md5 = $md5->addfile($fh); + $md5->addfile($fh); close $fh; return $md5->hexdigest;