[Midnightbsd-cvs] mports: lib/Magus: Add cvs update support.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Mon Nov 5 13:56:48 EST 2007
Log Message:
-----------
Add cvs update support.
Fix typo in cluster. Cluster stuff still not ready for prime-time.
Modified Files:
--------------
mports/Tools/lib/Magus:
Cluster.pm (r1.2 -> r1.3)
mports/Tools/magus/master:
update_cluster.pl (r1.2 -> r1.3)
-------------- next part --------------
Index: Cluster.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Cluster.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -LTools/lib/Magus/Cluster.pm -LTools/lib/Magus/Cluster.pm -u -r1.2 -r1.3
--- Tools/lib/Magus/Cluster.pm
+++ Tools/lib/Magus/Cluster.pm
@@ -55,7 +55,7 @@
my $running_count = 1;
while ($running_count > 0) {
- $running_count = Magus::Task->search(type => $type, complete => 0)->count;
+ $running_count = Magus::Task->search(type => $type, completed => 0)->count;
sleep(5);
}
}
Index: update_cluster.pl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/master/update_cluster.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -LTools/magus/master/update_cluster.pl -LTools/magus/master/update_cluster.pl -u -r1.2 -r1.3
--- Tools/magus/master/update_cluster.pl
+++ Tools/magus/master/update_cluster.pl
@@ -36,6 +36,7 @@
use Magus;
use Mport::Utils qw(recurse_ports);
+use File::Path qw(rmtree);
#
# The basic outline of the update is this:
@@ -65,16 +66,19 @@
sub update_cvs_dir {
- #
- # Hrrrm...
- #
+ 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}";
+
+ system($cmd) == 0 || die "$cmd returned non-zero: $?\n";
}
sub make_tarball {
+ chdir($Magus::Config{'MasterDataDir'}) || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
unlink($Magus::Config{'MportsTarBall'})
|| ($! !~ m/no such/i && die "Couldn't unlink $Magus::Config{'MportsTarBall'}: $!\n");
- chdir($Magus::Config{'MasterDataDir'}) || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
my $tar = "/usr/bin/tar cfj $Magus::Config{MportsTarBall} $Magus::Config{MportsCvsDir}";
More information about the Midnightbsd-cvs
mailing list