[Midnightbsd-cvs] mports: lib/Magus: New set results stuff
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Oct 2 17:13:57 EDT 2008
Log Message:
-----------
New set results stuff
Modified Files:
--------------
mports/Tools/lib/Magus:
Index.pm (r1.12 -> r1.13)
Port.pm (r1.18 -> r1.19)
-------------- next part --------------
Index: Port.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Port.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -L Tools/lib/Magus/Port.pm -L Tools/lib/Magus/Port.pm -u -r1.18 -r1.19
--- Tools/lib/Magus/Port.pm
+++ Tools/lib/Magus/Port.pm
@@ -128,74 +128,68 @@
}
-=head2 $port->set_result_pass($phase => $name => $message);
+=head2 $port->set_result_pass($message);
-A convience method for setting a port as passed. Creates one subresult of
-type C<$name>, with message C<$message> in phase C<$phase>.
+A convience method for setting a port as passed.
=cut
sub set_result_pass {
- my ($self, $phase, $name, $msg) = @_;
+ my ($self, $msg) = @_;
- $self->_set_result('pass', $phase, $name, $msg);
+ $self->_set_result('pass', $msg);
}
-=head2 $port->set_result_skip($phase => $name => $message);
+=head2 $port->set_result_skip($message);
-A convience method for setting a port as skipped. Creates one subresult of
-type C<$name>, with message C<$message> in phase C<$phase>.
+A convience method for setting a port as skipped.
=cut
sub set_result_skip {
- my ($self, $phase, $name, $msg) = @_;
+ my ($self, $msg) = @_;
- $self->_set_result('skip', $phase, $name, $msg);
+ $self->_set_result('skip', $msg);
}
-=head2 $port->set_result_internal($phase => $name => $message);
+=head2 $port->set_result_internal($message);
-A convience method for setting a port as internalled. Creates one subresult of
-type C<$name>, with message C<$message> in phase C<$phase>.
+A convience method for setting a port as internalled.
=cut
sub set_result_internal {
- my ($self, $phase, $name, $msg) = @_;
+ my ($self, $msg) = @_;
- $self->_set_result('internal', $phase, $name, $msg);
+ $self->_set_result('internal', $msg);
}
-=head2 $port->set_result_fail($phase, $name => $message);
+=head2 $port->set_result_fail($message);
-A convience method for setting a port as failed. Creates one subresult of
-type C<$name>, with message C<$message> in phase C<$phase>.
+A convience method for setting a port as failed.
=cut
sub set_result_fail {
- my ($self, $phase, $name, $msg) = @_;
+ my ($self, $msg) = @_;
- $self->_set_result('fail', $phase, $name, $msg);
+ $self->_set_result('fail', $msg);
}
sub _set_result {
- my ($self, $status, $phase, $name, $msg) = @_;
+ my ($self, $status, $msg) = @_;
$self->status($status);
$self->update;
$self->add_to_events({
machine => $Magus::Machine,
- type => $status,
msg => $msg,
- phase => $phase,
});
}
Index: Index.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Index.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -L Tools/lib/Magus/Index.pm -L Tools/lib/Magus/Index.pm -u -r1.12 -r1.13
--- Tools/lib/Magus/Index.pm
+++ Tools/lib/Magus/Index.pm
@@ -86,7 +86,7 @@
if ($dump{is_interactive}) {
print "\n\tIGNORE set. Marking as skippped.";
- $port->set_result_skip(index => IsInteractive => "Port is marked as interactive.");
+ $port->set_result_skip("Port is marked as interactive.");
}
print "done.\n";
@@ -102,7 +102,7 @@
if (!$depend) {
warn "\tMissing depend for $port: $_\n";
- $port->set_result_fail(index => 'NonExistantDepend' => qq(depend "$_" does not exist.));
+ $port->set_result_fail(qq(depend "$_" does not exist.));
next PORT;
}
More information about the Midnightbsd-cvs
mailing list