arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3474 - fix parsing of rpm names for kitpkgdeps

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15901 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2013-04-09 13:11:19 +00:00
parent af8cf07ece
commit 361c5e5665
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-buildkit/bin/buildkit
View File

@ -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";
}