[Midnightbsd-cvs] mports: magus/master: Set the tree id when the tarball is made, just to
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Feb 28 17:25:40 EST 2008
Log Message:
-----------
Set the tree id when the tarball is made, just to simplify things.
Modified Files:
--------------
mports/Tools/magus/master:
update_cluster.pl (r1.6 -> r1.7)
Removed Files:
-------------
mports/Tools/magus/master:
halt_cluster.pl
resume_cluster.pl
-------------- next part --------------
--- Tools/magus/master/resume_cluster.pl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/local/bin/perl
-#
-# $MidnightBSD: mports/Tools/magus/master/resume_cluster.pl,v 1.1 2007/10/31 18:02:28 ctriv Exp $
-#
-
-use strict;
-use warnings;
-use lib qw(/usr/mports/Tools/lib);
-
-use Magus;
-
-$Magus::Machine = Magus::Machine->retrieve(name => 'master');
-
-Magus::Cluster::resume();
Index: update_cluster.pl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/master/update_cluster.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -L Tools/magus/master/update_cluster.pl -L Tools/magus/master/update_cluster.pl -u -r1.6 -r1.7
--- Tools/magus/master/update_cluster.pl
+++ Tools/magus/master/update_cluster.pl
@@ -89,7 +89,7 @@
return;
}
- #update_cvs_dir();
+ update_cvs_dir();
foreach my $done (@completed) {
my $run = Magus::Run->create({osversion => $done->osversion, arch => $done->arch});
@@ -121,6 +121,8 @@
my ($run) = @_;
my $tarball = $run->tarball;
+
+ set_tree_id("$Magus::Config{'MasterDataDir'}/$Magus::Config{'MportsCvsDir'}", $run);
chdir($Magus::Config{'MasterDataDir'}) || die "Couldn't cd to $Magus::Config{'MasterDataDir'}: $!\n";
unlink($tarball) || ($! !~ m/no such/i && die "Couldn't unlink $tarball: $!\n");
@@ -135,3 +137,13 @@
my @runs = grep { $_->is_empty } Magus::Run->search(status => 'active');
}
+
+sub set_tree_id {
+ my ($root, $run) = @_;
+ my $file = "$root/.magus_run_id";
+
+ open(ID, '>', $file) || die "Couldn't open $file: $!\n";
+ print ID $run->id, "\n";
+ close(ID) || die "Couldn't close $file: $!\n";
+}
+
--- Tools/magus/master/halt_cluster.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/local/bin/perl
-#
-# $MidnightBSD: mports/Tools/magus/master/halt_cluster.pl,v 1.1 2007/10/31 18:02:28 ctriv Exp $
-#
-use strict;
-use warnings;
-use lib qw(/usr/mports/Tools/lib);
-
-use Magus;
-
-$Magus::Machine = Magus::Machine->retrieve(name => 'master');
-
-Magus::Cluster::halt();
\ No newline at end of file
More information about the Midnightbsd-cvs
mailing list