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

Support wildcards in package names in buildkit.conf

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14905 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-01-17 03:34:26 +00:00
parent f4a553d085
commit 2a12e49888
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-buildkit/bin/buildkit
View File

@ -1466,7 +1466,8 @@ sub validate_bldkitconf
return 1;
}
my $ck_file = $ck_dir."/".$kp->{filename};
if (! -r $ck_file ) {
if ( system("ls $ck_file > /dev/null") ) {
# if (! -r $ck_file ) {
print "Pre-built rpm $ck_file defined in Kit Package \"$kp->{filename}\" does not exist or is not readable\n";
return 1;
}
@ -1540,7 +1541,8 @@ sub validate_repo
foreach my $pkg (@{$repo->{packages}}){
my $pkg_filename = $repodir.'/'.$pkg;
if (! -r $pkg_filename) {
if ( system("ls $pkg_filename > /dev/null") ) {
# if (! -r $pkg_filename) {
if ($::VERBOSE) {
print "\nFile $pkg in directory $repodir does not exist or is not readable. \n";
}
@ -2307,8 +2309,8 @@ sub kit_addpkgs
next;
}
if ( ($ext_filename ne '') && ($ext_reponames ne '') ){
my $fromfile = $rpmdir."/".$ext_filename."*";
if ( system("ls $fromfile") ){
my $fromfile = $rpmdir."/".$ext_filename;
if ( system("ls $fromfile > /dev/null") ){
print "The product package file $ext_filename could not be read from the package directory $rpmdir. \n";
# Cleanup
system ("rm -Rf /tmp/buildkit_workdir");