[Midnightbsd-cvs] mports: lib/Magus: Check for LICENSE.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Fri Nov 2 14:43:45 EDT 2007


Log Message:
-----------
Check for LICENSE.  Let the warnings begin!

Modified Files:
--------------
    mports/Tools/lib/Magus:
        OutcomeRules.pm (r1.2 -> r1.3)
    mports/Tools/lib/Magus/OutcomeRules:
        Base.pm (r1.4 -> r1.5)
    mports/Tools/lib/Magus/Task:
        UpdateMports.pm (r1.2 -> r1.3)

-------------- next part --------------
Index: OutcomeRules.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/OutcomeRules.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -LTools/lib/Magus/OutcomeRules.pm -LTools/lib/Magus/OutcomeRules.pm -u -r1.2 -r1.3
--- Tools/lib/Magus/OutcomeRules.pm
+++ Tools/lib/Magus/OutcomeRules.pm
@@ -38,7 +38,9 @@
 
 use base qw(Magus::OutcomeRules::Base);
 
-
+sub FetchFailed :error {
+  m/Couldn't fetch it/ && return "Fetch failed.";
+}
 
 
 =head1 extract rules
@@ -59,7 +61,17 @@
 
 use base qw(Magus::OutcomeRules::Base);
 
+sub NoLicense :warning {
+  m/LICENSE not set/ && return "LICENSE is not set.";
+}
 
+sub EmptyLicense :warning {
+  m/empty license/ && return "LICENSE is empty.";
+}
+
+sub InvalidLicense :warning {
+  m/Invalid LICENSE: (\S+)/ && return "Invalid license set: $1";
+}
 
 =head1 configure rules
 
@@ -80,7 +92,6 @@
 use base qw(Magus::OutcomeRules::Base);
 
 
-
 =head1 fake rules
 
 =cut
Index: Base.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/OutcomeRules/Base.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -LTools/lib/Magus/OutcomeRules/Base.pm -LTools/lib/Magus/OutcomeRules/Base.pm -u -r1.4 -r1.5
--- Tools/lib/Magus/OutcomeRules/Base.pm
+++ Tools/lib/Magus/OutcomeRules/Base.pm
@@ -89,8 +89,8 @@
     phase => $phase,
     code  => $code,
   };
-   
-  push(@$rules, $code);
+  
+  push(@$rules, $entry);
   
   $class->warning_rules($rules);
 }
@@ -105,7 +105,7 @@
   local $_ = $$output;
   
   foreach my $rule (@{$class->warning_rules || []}) {
-    if (my $msg = $rule->()) {
+    if (my $msg = $rule->{code}->()) {
       $result{summary} = 'warn' if $result{summary} eq 'pass';
       push(@{$result{warnings}}, {
         phase => $rule->{phase},
Index: UpdateMports.pm
===================================================================
RCS file: /home/cvs/mports/Tools/lib/Magus/Task/UpdateMports.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -LTools/lib/Magus/Task/UpdateMports.pm -LTools/lib/Magus/Task/UpdateMports.pm -u -r1.2 -r1.3
--- Tools/lib/Magus/Task/UpdateMports.pm
+++ Tools/lib/Magus/Task/UpdateMports.pm
@@ -62,6 +62,7 @@
   my $tar = "/usr/bin/tar xf $Magus::Config{MportsTarBall}";
   system($tar) == 0 || die "$tar returned non-zero: $?";
   
+  $self->callbacks->{'log'}->("Restarting process.");
   $self->callbacks->{'restart'}->();
 }
 


More information about the Midnightbsd-cvs mailing list