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

[ctriv at midnightbsd.org]

Log Message:
-----------
Various bug fixes.

Modified Files:
--------------
    mports/Tools/lib/Magus:
        Index.pm (r1.5 -> r1.6)
    mports/Tools/magus/master:
        update_cluster.pl (r1.3 -> r1.4)

-------------- next part --------------
Index: Index.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Index.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -LTools/lib/Magus/Index.pm -LTools/lib/Magus/Index.pm -u -r1.5 -r1.6
--- Tools/lib/Magus/Index.pm
+++ Tools/lib/Magus/Index.pm
@@ -39,13 +39,14 @@
 sub sync {
   my ($class) = @_;
   my %visited;
-  
+  my $root = "$Magus::Config{MasterDataDir}/$Magus::Config{MportsCvsDir}";
   local $| = 1;
+
   
   recurse_ports {
     print @_, "...";
     
-    my $yaml = `BATCH=1 PACKAGE_BUILDING=1 MAGUS=1 make describe-yaml`;
+    my $yaml = `PORTSDIR=$root BATCH=1 PACKAGE_BUILDING=1 MAGUS=1 make describe-yaml`;
     my %dump;
     
     eval {
@@ -75,7 +76,7 @@
   
     print " done\n";
     $visited{$port->name}++;
-  } root    => "$Magus::Config{MasterDataDir}/$Magus::Config{MportsCvsDir}",
+  } root    => $root,
     nochdir => sub { 
       (my $name = $_[0]) =~ s:.*/(.*?/.*?)$:$1:;
       my $port = Magus::Port->find_or_create({name => $name});
Index: update_cluster.pl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/master/update_cluster.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -LTools/magus/master/update_cluster.pl -LTools/magus/master/update_cluster.pl -u -r1.3 -r1.4
--- Tools/magus/master/update_cluster.pl
+++ Tools/magus/master/update_cluster.pl
@@ -69,7 +69,7 @@
   chdir($Magus::Config{'MasterDataDir'})  || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
   rmtree($Magus::Config{MportsCvsDir})    || die "Couldn't rmtree $Magus::Config{'MportsCvsDir'}: $!\n";
   
-  my $cmd = "cvs -z 5 co $Magus::Config{MportsCvsDir}";
+  my $cmd = "cvs -d anoncvs\@stargazer.midnightbsd.org:/home/cvs -P -z 5 co $Magus::Config{MportsCvsDir}";
   
   system($cmd) == 0 || die "$cmd returned non-zero: $?\n";
 }