Changeset 749

Timestamp:

06/07/07 18:15:59 (6 years ago)

Author:

max

Message:

Various cosmetic changes, in particular make standard update text less noisy

Files:

• applications/shepherd (modified) (11 diffs)
• status (modified) (1 diff)

applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '0.4.110';
+my $version = '0.4.111';
 
 # tv_grab_au
@@ -333 +333 @@
     $ver = $components->{$proggy}->{ver} if (defined $components->{$proggy} and -e query_filename($proggy,$progtype));
 
-    my ($result, $action);
+    my ($result, $action, $component_csum);
 
     if ($components->{$proggy} and $components->{$proggy}->{disabled} and $components->{$proggy}->{disabled} == 1)
@@ -354 +354 @@
         }
     }
+
+    # if component is up-to-date, check it still works and isn't tainted (modified)
+    if (defined $result and $result == 0)
+    {
+        # check it still works
+        my $test_result = 1;
+        if ($progtype ne 'application' and $progtype ne 'reference') 
+        {
+            $test_result = test_proggy($proggy, $progtype, undef, 1);
+        }
+
+        if (!$test_result) 
+        {
+            # broken
+            $action = 'FAILED';
+            $plugin_data->{$proggy}->{failed_test} = 1;
+        } 
+        else 
+        {
+            # verify the component isn't tainted
+            $component_csum = csum_file(query_ldir($proggy, $progtype)."/".$proggy);
+            if ($component_csum ne $csum2) 
+            {
+                # tainted
+                $action = 'TAINTED';
+            }
+        }
+    }
+
     &log(2,sprintf  "* %-54s%17s\n",
                     ucfirst($progtype) . " $proggy" .
@@ -359 +388 @@
                     $action);
 
-    # if component is up-to-date, check it still works and isn't tainted (modified)
-    if ((defined $result) && ($result == 0)) {
-        # check that it still works
-        my $test_result = 1;
-        if ($progtype ne 'application' and $progtype ne 'reference') {
-            $test_result = test_proggy($proggy, $progtype, undef, 1);
-        }
-
-        if (!$test_result) {
-            # broken
-            $plugin_data->{$proggy}->{failed_test} = 1;
-        } else {
-            # verify that the component isn't tainted
-            my $component_csum = csum_file(query_ldir($proggy, $progtype)."/".$proggy);
-            if ($component_csum ne $csum2) {
-                # tainted
-                &log(2,"\nWARNING: Component '$proggy' ($progtype) has been modified/tainted\n".
-                    " -  expected checksum: $csum2\n".
-                    " -  actual checksum:   $component_csum\n\n");
-
-                # are we running a manual update?
-                if ($opt->{update}) {
-                    # yes - manually force the tainted module to be reinstalled
-                    $result = -1;
-                    &log("Forcing reinstall of $proggy due to existing component modified/tainted.\n".
-                        "If you DON'T wish this to happen CTRL-C now...\n");
-                    &countdown(15);
-                } else {
-                    # no - whinge about the tainted module
-                    $plugin_data->{$proggy}->{tainted} = 1;
-                    $plugin_data->{tainted} = 1;
-                    $components_used .= "[tainted]" if ($proggy eq $progname);
-
-                    &log(2,"Modifying Shepherd or its components is not recommended.  If you have added\n".
-                        "functionality in some way, why not contribute it back?  See the wiki at\n".
-                        "$wiki for details.\n\n".
-                        "If you wish to revert $proggy back to the standard module, run ".ucfirst($progname)."\n".
-                        "with --update manually.\n\n");
-                    &countdown(10);
-                    &log(2,"\n\n");
-                }
-            }
-        }
-    }
+    if ($action eq 'FAILED')
+    {
+        &log(2,"  For details, run Shepherd with --check option.\n");
+    }
+    if ($action eq 'TAINTED')
+    {
+        &log(2,"\nWARNING: Component '$proggy' ($progtype) has been modified/tainted\n".
+               " -  expected checksum: $csum2\n".
+               " -  actual checksum:   $component_csum\n\n");
+
+        # are we running a manual update?
+        if ($opt->{update}) {
+            # yes - manually force the tainted module to be reinstalled
+            $result = -1;
+            &log("Forcing reinstall of $proggy due to existing component modified/tainted.\n".
+                 "If you DON'T wish this to happen CTRL-C now...\n");
+             &countdown(15);
+         } else {
+             # no - whinge about the tainted module
+             $plugin_data->{$proggy}->{tainted} = 1;
+             $plugin_data->{tainted} = 1;
+             $components_used .= "[tainted]" if ($proggy eq $progname);
+
+             &log(2,"Modifying Shepherd or its components is not recommended.  If you have added\n".
+                    "functionality in some way, why not contribute it back?  See the wiki at\n".
+                    "$wiki for details.\n\n".
+                    "If you wish to revert $proggy back to the standard module, run ".ucfirst($progname)."\n".
+                    "with --update manually.\n\n");
+             &countdown(10);
+             &log(2,"\n\n");
+         }
+     }
 
     return $result if (defined $opt->{noupdate});
@@ -426 +443 @@
 {
     my ($proggy, $latestversion, $progtype, $oldver, $csum1, $csum2) = @_;
+
     my $config;
-
     my $rdir = "";
     my $basedir = $CWD."/".$progtype."s";
@@ -567 +584 @@
     if ($result)
     {
-        &log("Testing $proggy ... ") if ($quiet);
-        &log("FAIL.\n\n".ucfirst($progtype) . " $proggy did not exit cleanly!\n" .
-             "It may require configuration.\n");
-
-        &log(sprintf("<<<<<< output from $proggy was as follows:\n%s\n>>>>>> end output from $proggy\n",$test_output));
-
+        unless ($quiet)
+        {
+            &log("FAIL.\n\n".ucfirst($progtype) . " $proggy did not exit cleanly!\n");
+
+            # can we give any more details on why it failed?
+            if ($test_output and $test_output =~ /Can't locate (.*) in \@INC/) 
+            {
+                my $modname = $1;
+                $modname =~ s#/#::#g;       # turn / into ::
+                $modname =~ s#\.pm##g;      # remove .pm suffix
+                $statusmsg = "Missing module \"$modname\"";
+
+                &log("Probably failed due to dependency on missing module '".$modname."'\n");
+            }
+            else
+            {
+                &log("It may require configuration.\n");
+            }
+
+            &log(sprintf("\n<<<<<< output from $proggy was as follows:\n%s>>>>>> end output from $proggy\n\n",$test_output));
+        }
         # set proggy status accordingly
-        $statusmsg = sprintf "FAILED (return code %d%s) on %s",
-            $result,
-            ($resultmsg eq "" ? "" : ", '$resultmsg'"),
-            POSIX::strftime("%a%d%b%y", localtime(time));
-
-        # can we give any more details on why it failed?
-        if ($test_output and $test_output =~ /Can't locate (.*) in \@INC/) {
-            my $modname = $1;
-            $modname =~ s#/#::#g;       # turn / into ::
-            $modname =~ s#\.pm##g;      # remove .pm suffix
-            $statusmsg .= ": missing '".$modname."' module.";
-
-            &log("Probably failed due to dependency on missing module '".$modname."'\n");
-        }
-
-        &log("\n");
+        unless ($statusmsg)
+        {
+            $statusmsg = sprintf "return code %d%s", $result, ($resultmsg eq "" ? "" : ", '$resultmsg'");
+        }
+        $statusmsg = sprintf "FAILED (%s) on %s",
+                         $statusmsg,
+                         POSIX::strftime("%a%d%b%y", localtime(time));
     }
     else
@@ -603 +626 @@
 
     # update status message
-    if ((defined $statusmsg) && ($statusmsg ne "")) {
-        if ((defined $specific_version) && ($specific_version ne "")) {
+    if ($statusmsg) {
+        if ($specific_version) {
             $components_pending_install->{$proggy}->{admin_status} = $statusmsg;
         } elsif (defined $components->{$proggy}) {
@@ -1127 +1150 @@
 
     &rotate_logfiles;
-    &log(1, "Logging to $log_file.\n");
+    &log(1, "Logging to: $log_file\n");
     open(LOG_FILE,">>$LOG_DIR/$log_file") || die "can't open log file $LOG_DIR/$log_file for writing: $!\n";
 
@@ -1179 +1202 @@
 {
     my ($component,$prog,$want_output,$timeout,$display_output,$progtype) = @_;
+
     $timeout = 0 if (!defined $timeout);
     $want_output = 0 if (!defined $want_output);
@@ -1242 +1266 @@
         return (($? & 127), "Died:$msg", $prog_output);
     } 
-    &log(1, (sprintf "%s exited with value %d\n", ucfirst($component), ($? >> 8)));
 
     return (0,"",$prog_output) unless ($? >> 8);
@@ -1494 +1517 @@
 sub check_lock
 {
-    print "Locking $0.\n";
-    open SELF, "< $0" or die "Can't open $0: $!\n";
-    $lock = (flock SELF, &Fcntl::LOCK_EX | &Fcntl::LOCK_NB);
+    print "Locking: $0\n";
+    if (open SELF, "< $0")
+    {
+        $lock = (flock SELF, &Fcntl::LOCK_EX | &Fcntl::LOCK_NB);
+    }
+    else
+    {
+        print "Lock failed: can't open $0: $!\n";
+    }
 }
 

status

@@ -1 @@
-application     shepherd            0.4.110
+application     shepherd            0.4.111
 reference       channel_list        2
 reference       Shepherd/Common.pm  0.15