From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14711 invoked by alias); 28 Feb 2008 19:12:18 -0000 Received: (qmail 14680 invoked by uid 9708); 28 Feb 2008 19:12:18 -0000 Date: Thu, 28 Feb 2008 19:12:00 -0000 Message-ID: <20080228191218.14665.qmail@sourceware.org> From: tthomas@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fixes bz#5802. Additional error handling for fdebugrpm. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 72543106fcd8c66bcbda2fac110ef2d792fd2c44 X-Git-Newrev: 41417f3ab9ce44f1f77024b3da0f91a61967a049 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00277.txt.bz2 The branch, master has been updated via 41417f3ab9ce44f1f77024b3da0f91a61967a049 (commit) via 56b0aa1ac0096acf0d095509e1231a65fb047df1 (commit) from 72543106fcd8c66bcbda2fac110ef2d792fd2c44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 41417f3ab9ce44f1f77024b3da0f91a61967a049 Author: Teresa Date: Thu Feb 28 14:01:30 2008 -0500 Fixes bz#5802. Additional error handling for fdebugrpm. frysk-core/frysk/bindir/ChangeLog: 2008-02-28 Teresa Thomas * fdebugrpm.sh: Show error message if fdebuginfo install or arguments missing. commit 56b0aa1ac0096acf0d095509e1231a65fb047df1 Author: Teresa Date: Thu Feb 28 13:55:50 2008 -0500 Clean up imports. frysk-core/frysk/testbed/ChangeLog: 2008-02-28 Teresa Thomas * CorefileFactory.java: Remove redundant import. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 5 ++ frysk-core/frysk/bindir/fdebugrpm.sh | 62 +++++++++++++++---------- frysk-core/frysk/testbed/ChangeLog | 4 ++ frysk-core/frysk/testbed/CorefileFactory.java | 1 - 4 files changed, 47 insertions(+), 25 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 8a4cbe8..c2f4788 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,8 @@ +2008-02-28 Teresa Thomas + + * fdebugrpm.sh: Show error message if fdebuginfo install + or arguments missing. + 2008-02-28 Tim Moore * fhpd.java (TerminalObserver): New class diff --git a/frysk-core/frysk/bindir/fdebugrpm.sh b/frysk-core/frysk/bindir/fdebugrpm.sh index 38ce411..1c87e3f 100644 --- a/frysk-core/frysk/bindir/fdebugrpm.sh +++ b/frysk-core/frysk/bindir/fdebugrpm.sh @@ -42,32 +42,46 @@ # Requires pid(s) as argument # Run fdebuginfo and get the name of missing debuginfo packages - -export packages=`@bindir@/fdebuginfo "$*" | grep "\-\-\-" | - cut -d ' ' -f 1 | - sort | uniq | - grep '^/'| - xargs rpm -qf --qf '%{SOURCERPM}\n' | - sort | uniq | - sed -e 's/-/-debuginfo-/' | - sed -e 's/.src.rpm//g'` -if [ -n "$packages" ] +# Display error message if no args provided +if [ $# -lt 1 ] then - # Display missing packages - echo "" - echo "Missing Debuginfo package(s)" - echo "============================" - echo "$packages" - echo "" + echo "No arguments provided." + exit +fi + +# Check if fdebuginfo is installed. +if ! test -f "@bindir@/fdebuginfo" +then + echo "fdebugrpm error: Frysk not installed." + +else + export packages=`@bindir@/fdebuginfo $* | grep "\-\-\-" | + cut -d ' ' -f 1 | + sort | uniq | + grep '^/'| + xargs rpm -qf --qf '%{SOURCERPM}\n' | + sort | uniq | + sed -e 's/-/-debuginfo-/' | + sed -e 's/.src.rpm//g'` - # Install on user request - read -p "Do you wish to install the above packages? [y/n]: " ch - if [ "$ch" = "y" ] + if [ -n "$packages" ] then - sudo yum install --enablerepo=*-debuginfo $packages - fi + # Display missing packages + echo "" + echo "Missing Debuginfo package(s)" + echo "============================" + echo "$packages" + echo "" -else - echo "No missing debuginfo packages" -fi + # Install on user request + read -p "Do you wish to install the above packages? [y/n]: " ch + if [ "$ch" = "y" ] + then + sudo yum install --enablerepo=*-debuginfo $packages + fi + + else + echo "No missing debuginfo packages" + fi +fi \ No newline at end of file diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog index acce90b..98d033a 100644 --- a/frysk-core/frysk/testbed/ChangeLog +++ b/frysk-core/frysk/testbed/ChangeLog @@ -1,3 +1,7 @@ +2008-02-28 Teresa Thomas + + * CorefileFactory.java: Remove redundant import. + 2008-02-27 Andrew Cagney * TestCorefileFactory.java: Use LinuxCoreFactory. diff --git a/frysk-core/frysk/testbed/CorefileFactory.java b/frysk-core/frysk/testbed/CorefileFactory.java index a4fd040..369bf5f 100644 --- a/frysk-core/frysk/testbed/CorefileFactory.java +++ b/frysk-core/frysk/testbed/CorefileFactory.java @@ -44,7 +44,6 @@ import frysk.event.Event; import frysk.proc.Manager; import frysk.proc.Proc; import frysk.proc.ProcBlockAction; -import frysk.testbed.CoredumpAction; import frysk.Config; public class CorefileFactory extends TestLib { hooks/post-receive -- frysk system monitor/debugger