move FML::Base:: to FML::

4 files changed, 21 insertions, 38 deletions

diff --git a/fml/lib/FML/Base/Errors.pm b/fml/lib/FML/Errors.pm
index 5c166c22..011107eb 100644
--- a/fml/lib/FML/Base/Errors.pm
+++ b/fml/lib/FML/Errors.pm
@@ -8,7 +8,7 @@
 # $FML$
 #
 
-package FML::Base::Errors;
+package FML::Errors;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
 use Carp;
@@ -19,12 +19,12 @@ require Exporter;
 
 =head1 NAME
 
-FML::Base::Errors.pm - error handling utilities
+FML::Errors.pm - error handling utilities
 
 =head1 SYNOPSIS
 
 	package Something;
-	use FML::Base::Errors qw(error_reason error error_reset);
+	use FML::Errors qw(error_reason error error_reset);
 
 	sub xxx
 	{
@@ -54,7 +54,7 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::Base::Errors.pm appeared in fml5.
+FML::Errors.pm appeared in fml5.
 
 =cut
 
diff --git a/fml/lib/FML/Base/File.pm b/fml/lib/FML/File.pm
index f17ff7cc..c7ce6abe 100644
--- a/fml/lib/FML/Base/File.pm
+++ b/fml/lib/FML/File.pm
@@ -8,7 +8,7 @@
 # $FML$
 #
 
-package FML::Base::File;
+package FML::File;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $ErrorString);
 use Carp;
@@ -20,25 +20,12 @@ require Exporter;
 
 =head1 NAME
 
-FML::Base::Errors.pm - error handling utilities
+FML::File.pm - error handling utilities
 
 =head1 SYNOPSIS
 
-	package Something;
-	use FML::Base::Errors qw(error_reason error error_reset);
-
-	sub xxx
-	{
-		if something errors ...
-		$self->error_reason( error reason );
-	}
-
-When you use Something module,
-
-	use Something;
-	$obj = new Something;
-	unless ($obj->error) { $obj->do_somting( ...); };
-
+   use FML::File qw(mkdiehier);
+   mkdirhier($dir, $mode);
 
 =head1 DESCRIPTION
 
@@ -55,20 +42,22 @@ redistribute it and/or modify it under the same terms as Perl itself.
 
 =head1 HISTORY
 
-FML::Base::Errors.pm appeared in fml5.
+FML::File.pm appeared in fml5.
 
 =cut
 
 sub error       { return $ErrorString;}
+
 sub error_reset { undef $ErrorString;}
 
 sub mkdirhier
 {
     my ($dir, $mode) = @_;
 
-    eval q{ 
+    # XXX $mode (e.g. 0755) should be a numeric not a string
+    eval qq{ 
 	use File::Path;
-	mkpath($dir, 0, $mode);
+	mkpath(\$dir, 0, $mode);
     };
     $ErrorString = $@;
 }
@@ -76,7 +65,7 @@ sub mkdirhier
 
 sub touch
 {
-
+    my ($file, $mode) = @_;
 }
 
 
diff --git a/fml/lib/FML/SequenceFile.pm b/fml/lib/FML/SequenceFile.pm
index fd44c25d..aec094ba 100644
--- a/fml/lib/FML/SequenceFile.pm
+++ b/fml/lib/FML/SequenceFile.pm
@@ -12,7 +12,7 @@ package FML::SequenceFile;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
 use Carp;
-use FML::Base::Errors qw(error_reason error error_reset);
+use FML::Errors qw(error_reason error error_reset);
 
 require Exporter;
 @ISA = qw(Exporter);
diff --git a/fml/lib/FML/Ticket/System.pm b/fml/lib/FML/Ticket/System.pm
index 9bd8a7dc..2fef1e57 100644
--- a/fml/lib/FML/Ticket/System.pm
+++ b/fml/lib/FML/Ticket/System.pm
@@ -13,7 +13,8 @@ package FML::Ticket::System;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
-use FML::Base::Errors qw(error_reason error error_reset);
+use FML::Errors qw(error_reason error error_reset);
+use FML::Log qw(Log);
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -48,14 +49,11 @@ sub update_ticket_trace_cache
     my $db_dir    = $config->{ ticket_db_dir };
     my $ml_name   = $config->{ ml_name };
     my $cachefile = $db_dir. $ml_name;
-    my $umask     = $config->{ default_umask } || 0022;
-
-    printf "%o\n", (0777 & $umask);
 
     unless (-d $db_dir) {
-	use FML::Base::File qw(mkdirhier);
-	mkdirhier($db_dir, 0755);
-	$self->error_reason( FML::Base::File->error() );
+	use FML::File qw(mkdirhier);
+	mkdirhier($db_dir, $config->{ default_directory_mode });
+	$self->error_reason( FML::File->error() );
 	return;
     }
 
@@ -74,11 +72,7 @@ sub update_ticket_trace_cache
 sub AUTOLOAD
 {
     my ($self) = @_;
-
-    eval q{
-	use FML::Log;
-	Log("FYI: unknown method $AUTOLOAD is called");
-    };
+    Log("FYI: unknown method $AUTOLOAD is called");
 }