--- loncom/build/CHECKRPMS	2006/10/05 17:44:38	1.4
+++ loncom/build/CHECKRPMS	2007/09/13 21:50:37	1.9
@@ -39,9 +39,10 @@ to LON-CAPA systems. distprobe is used t
 
 The utility which is used to complete the check depends on the distro:
 
-fedora - yum
+fedora, rhel 5/5+, centos, scientific - yum
 suse 9.X and sles9 - you
-suse 10.X and sles10 - rug
+suse 10.2,10.3 - zypper 
+sles10,suse10.1 - rug
 rhel 4 - up2date
 others - check-rpms
 
@@ -80,18 +81,44 @@ if ($distro =~ /^fedora\d+$/) {
     $cmd = 'yum update';
     &prepare_msg($tmpfile,$cmd);
     ($send,$addsubj) = &check_with_yum($tmpfile);
-} elsif ($distro =~ /^(suse|sles)9\.\d$/) {
+} elsif ($distro =~ /^(suse|sles)9\.?\d?$/) {
     $cmd = 'you';
     &prepare_msg($tmpfile,$cmd);
     ($send,$addsubj) = &check_with_you($tmpfile);
-} elsif ($distro =~ /^(suse|sles)10\.?\d?$/) {
+} elsif ($distro =~ /^suse10\.(\d)$/) {
+    my $version =$1;
+    if ($version > 1) { 
+        $cmd = 'zypper up';
+        &prepare_msg($tmpfile,$cmd);
+        ($send,$addsubj) = &check_with_zypper($tmpfile);
+    } else {
+        $cmd = 'rug up';
+        &prepare_msg($tmpfile,$cmd);
+        ($send,$addsubj) = &check_with_rug($tmpfile);
+    }
+} elsif ($distro =~ /^sles10$/) {
     $cmd = 'rug up';
     &prepare_msg($tmpfile,$cmd);
     ($send,$addsubj) = &check_with_rug($tmpfile);
-} elsif ($distro =~ /^rhes4$/) {
-    $cmd ='up2date -u --nox';
+} elsif ($distro =~ /^rhes(\d+)$/) {
+    my $version = $1;
+    if ($version == 4) {
+        $cmd ='up2date -u --nox';
+        &prepare_msg($tmpfile,$cmd);
+        ($send,$addsubj) = &check_with_up2date($tmpfile);
+    } elsif ($version > 4) {
+        $cmd = 'yum update';
+        &prepare_msg($tmpfile,$cmd);
+        ($send,$addsubj) = &check_with_yum($tmpfile);
+    }
+} elsif ($distro =~ /^centos\d+$/) {
+    $cmd = 'yum update';
+    &prepare_msg($tmpfile,$cmd);
+    ($send,$addsubj) = &check_with_yum($tmpfile);
+} elsif ($distro =~ /^scientific\d+\.\d$/) {
+    $cmd = 'yum update';
     &prepare_msg($tmpfile,$cmd);
-    ($send,$addsubj) = &check_with_up2date($tmpfile);
+    ($send,$addsubj) = &check_with_yum($tmpfile);
 } else {
     $cmd = '/usr/local/bin/check-rpms --update';
     ($send,$addsubj) = &check_with_checkrpms($tmpfile);
@@ -113,7 +140,7 @@ $cmd
 
 to bring it up to date.
 
-This is very important for the security of your server.  The table below lists the packages which need to be updated.
+This is very important for the security of your server.  The packages which need to be updated are listed below.
 
 ENDHEADER
     close(TMPFILE);
@@ -126,15 +153,32 @@ sub check_with_you {
     my $sendflag = 0;
     my $append_to_subj;
 
-    if (open (PIPE, "$you -d -k -l en 2>&1 |")) {
+    if (open (PIPE, "$you -k -len 2>&1 |")) {
         my $output=<PIPE>;
         close(PIPE);
         chomp $output;
         unless ($output eq 'No updates available.') {
-            my $command = $you.' -s  -k -l en |grep ^[^I]  >>'.$tmpfile;
-            system($command);
-            $sendflag = 1;
-            $append_to_subj = ' RPMS to upgrade';
+            if (open (PIPE, "$you -s -d -len |grep ^INSTALL |")) {
+                my @updates = <PIPE>;
+                close(PIPE);
+                my $allpackages;
+                foreach my $line (@updates) {
+                    my $package = substr($line,rindex($line,'/')+1);
+                    if ($package ne '') {
+                        $allpackages .= $package;
+                    }
+                }
+                if ($allpackages ne '') {
+                    open(TMPFILE,">>$tmpfile");
+                    print TMPFILE $allpackages;
+                    close(TMPFILE);
+                    $sendflag = 1;
+                    $append_to_subj = ' RPMS to upgrade';
+                }
+            } else {
+                $sendflag = 1;
+                $append_to_subj = ' Error running RPM update script';
+            }
         }
     } else {
         $sendflag = 1;
@@ -239,6 +283,8 @@ sub check_with_rug {
                 last;
             } elsif ($line eq 'No updates are available.') {
                 last;
+            } elsif ($line eq 'Downloading Packages...') {
+                last;
             } else {
                 push(@clean_output,$line);
             }
@@ -253,6 +299,55 @@ sub check_with_rug {
     } else {
         $append_to_subj = ' Error running RPM update check';
         $sendflag = 1;
+    }
+    return ($sendflag,$append_to_subj);
+}
+
+sub check_with_zypper {
+    my ($tmpfile) = @_;
+    my $zypper = '/usr/bin/zypper';
+    my $sendflag = 0;
+    my $append_to_subj;
+    my $header;
+    #
+    # Execute zypper command to check for updates
+    if (open (PIPE, "$zypper lu 2>&1 |")) {
+        my @output=<PIPE>;
+        close(PIPE);
+        chomp(@output);
+        my @clean_output;
+        foreach my $line (@output) {
+            if ($line eq 'Restoring system sources...') {
+                next;
+            } elsif ($line =~ /^Parsing\smetadata\sfor\s/) {
+                next;
+            } elsif ($line eq 'Parsing RPM database...') {
+                next;
+            } elsif ($line  =~ /^Catalog\s+\|\s+Name\s+\|\s+Version\s+\|\s+Category\s+\|\s+Status$/) {
+                $header = $line."\n";
+                next;
+            } elsif ($line =~ /^[-+]+$/) {
+                $header .= $line."\n";
+                next;
+            } elsif ($line eq 'WARNING: These are only the updates affecting the updater itself.') {
+                next;
+            } elsif ($line eq 'There are others available too.') {
+                next;
+            } else {
+                push(@clean_output,$line);
+            }
+        }
+        if (@clean_output > 0) {
+            open(TMPFILE,">>$tmpfile");
+            my $message = join("\n",@clean_output);
+            print TMPFILE $header.$message;
+            close(TMPFILE);
+            $append_to_subj= ' RPMS to upgrade';
+            $sendflag = 1;
+        }
+    } else {
+        $append_to_subj = ' Error running RPM update check';
+        $sendflag = 1;
     }
     return ($sendflag,$append_to_subj);
 }