From 1bb3f61a84ddc294f0bb46cd7e2afb74f74072e1 Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 9 Apr 2013 13:08:39 +0000
Subject: [PATCH] defect 3474 - fix parsing of rpm names for kitpkgdeps

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15900 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-buildkit/bin/buildkit | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index 30e6f5d51..4bac07f9d 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -976,6 +976,9 @@ sub kit_cleanall
 {
 
     print "running buildkit cleanall... \n";
+
+    &kit_cleantar;
+
     if ( -d $::build_dir ) {
         if ( system("rm -Rf $::build_dir/* ") ) {
             print "Error removing contents of $::build_dir \n";
@@ -993,6 +996,7 @@ sub kit_cleanall
         system("rm -Rf $::workdir/debbuild");
     }
 
+    return 0;
 }
 
 #-----------------------------------------------------------------------------
@@ -1945,7 +1949,7 @@ sub update_kitcomp_kitpkgdeps
         if ( $d_short eq $d ) {
             # no version-release comparisons specified for this kitpkgdep
             # do we have an rpm file in the repo?
-            my $cmd = "rpm -q --qf \"%{NAME} >= %{VERSION}-%{RELEASE},\" -p $repodir/$d-*.rpm 2>/dev/null";
+            my $cmd = "rpm -q --qf \"%{NAME} >= %{VERSION}-%{RELEASE},\" -p $repodir/$d\[0-9\]-*.rpm 2>/dev/null";
             if ($::VERBOSE) {
                print "running rpm query to get version-release info: \n $cmd \n";
             }