merge changes from dla source

[debbugs.git] / Debbugs / Common.pm

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index 0875fabdeedf621dd44a24e358063d37b00ed2bc..f4a3f0cea33e70d78603d12c3bc2a62bbecc601e 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -46,7 +46,7 @@ BEGIN{
                     misc   => [qw(make_list globify_scalar)],
                     date   => [qw(secs_to_english)],
                     quit   => [qw(quit)],
-                    lock   => [qw(filelock unfilelock @cleanups lockpid)],
+                    lock   => [qw(filelock unfilelock lockpid)],
                    );
      @EXPORT_OK = ();
      Exporter::export_ok_tags(qw(lock quit date util misc));
@@ -232,7 +232,7 @@ sub getmaintainers {
     for my $file (@config{qw(maintainer_file maintainer_file_override pseduo_maint_file)}) {
         next unless defined $file;
         my $maintfile = IO::File->new($file,'r') or
-             die "Unable to open maintainer file $file: $!");
+             die "Unable to open maintainer file $file: $!";
         while(<$maintfile>) {
              next unless m/^(\S+)\s+(\S.*\S)\s*$/;
              ($a,$b)=($1,$2);