[Midnightbsd-cvs] mports: Config.pm: Add a framework for using a mports tree other than

[ctriv at midnightbsd.org]

Log Message:
-----------
Add a framework for using a mports tree other than /usr/mports for a slave 
magus process.

Modified Files:
--------------
    mports/Tools/lib/Magus:
        Config.pm (r1.3 -> r1.4)

-------------- next part --------------
Index: Config.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Config.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -L Tools/lib/Magus/Config.pm -L Tools/lib/Magus/Config.pm -u -r1.3 -r1.4
--- Tools/lib/Magus/Config.pm
+++ Tools/lib/Magus/Config.pm
@@ -34,20 +34,32 @@
 use warnings;
 use YAML qw(LoadFile);
 
-our %Config = ( load_config("$Magus::Root/config.yaml") );
+our %Config;
+
 
 sub import {
   no strict 'refs';
   
   my $caller = caller;
-  
+
   *{"$caller\::Config"} = \%Config;
 }
 
 sub load_config {
-  %Config = %{ LoadFile(shift) };
+  %Config = (
+    # defaults
+    SlaveSrcDir    => '/usr/src',
+    %{ LoadFile(shift) },
+  );
+  
+  # More defaults
+  $Config{SlaveDataDir}   ||= "$Magus::Root/slave-data";
+  $Config{SlaveMportsDir} ||= "$Config{SlaveDataDir}/mports";
 }
 
+BEGIN { load_config("$Magus::Root/config.yaml") };
+
+
 1;
 __END__