[Midnightbsd-cvs] mports: lib/Magus: Bug fixes.

[ctriv at midnightbsd.org]

Log Message:
-----------
Bug fixes.
* Try to keep indexing from using local configuration directives.
* Cleanup /compat/linux in dirty chroot dirs.

Modified Files:
--------------
    mports/Tools/lib/Magus:
        Chroot.pm (r1.17 -> r1.18)
        Index.pm (r1.11 -> r1.12)

-------------- next part --------------
Index: Chroot.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Chroot.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -L Tools/lib/Magus/Chroot.pm -L Tools/lib/Magus/Chroot.pm -u -r1.17 -r1.18
--- Tools/lib/Magus/Chroot.pm
+++ Tools/lib/Magus/Chroot.pm
@@ -71,16 +71,17 @@
   my ($class, %args) = @_;
   
   my $self = bless {
-    branch    => 'current',
-    prefix    => '/usr/magus',
+    branch      => 'current',
+    prefix      => '/usr/magus',
     # This are relative to $prefix/$branch
-    localbase => '/usr/local',
-    x11base   => '/usr/X11R6',
-    packages  => '/magus/packages',
-    distfiles => '/magus/distfiles',
-    workdir   => '/magus/work',    
-    logs      => '/magus/logs',
-    loopbacks => [qw(/usr/mports /usr/src)],
+    localbase   => '/usr/local',
+    x11base     => '/usr/X11R6',
+    linuxcompat => '/compat/linux',
+    packages    => '/magus/packages',
+    distfiles   => '/magus/distfiles',
+    workdir     => '/magus/work',    
+    logs        => '/magus/logs',
+    loopbacks   => [qw(/usr/mports /usr/src)],
     %args,
   }, $class;
 
@@ -150,7 +151,7 @@
 sub _clean {
   my ($self) = @_;
   
-  for (qw(workdir x11base localbase packages logs)) {
+  for (qw(workdir x11base localbase packages logs linuxcompat)) {
     $self->_clear_flags($self->{$_});
     rmtree("$self->{root}/$self->{$_}");
     $self->_mkdir($self->{$_});
Index: Index.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Index.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -L Tools/lib/Magus/Index.pm -L Tools/lib/Magus/Index.pm -u -r1.11 -r1.12
--- Tools/lib/Magus/Index.pm
+++ Tools/lib/Magus/Index.pm
@@ -50,7 +50,7 @@
   recurse_ports {
     print @_, "... ";
     
-    my $yaml = `ARCH=$arch PORTSDIR=$root BATCH=1 PACKAGE_BUILDING=1 MAGUS=1 make describe-yaml`;
+    my $yaml = `__MAKE_CONF=/dev/null INDEXING=1 ARCH=$arch PORTSDIR=$root BATCH=1 PACKAGE_BUILDING=1 MAGUS=1 make describe-yaml`;
     my %dump;
       
     eval {