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

bug fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5782 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2010-04-15 18:02:44 +00:00
parent 97eae360ce
commit 01dd511f8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@ -313,7 +313,7 @@ sub makescript {
s/\s+$//; #remove trailing spaces
next if /^\s*$/; #-- skip empty lines
next if ( /^\s*#/ &&
!/^\s*#INCLUDE:/ &&
!/^\s*#INCLUDE:[^#^\n]+#/ &&
!/^\s*#NEW_INSTALL_LIST#/ ); #-- skip comments
push(@otherpkgs,$_);
}
@ -327,9 +327,9 @@ sub makescript {
my $doneincludes=0;
while (not $doneincludes) {
$doneincludes=1;
if ($pkgtext =~ /#INCLUDE:[^#]+#/) {
if ($pkgtext =~ /#INCLUDE:[^#^\n]+#/) {
$doneincludes=0;
$pkgtext =~ s/#INCLUDE:([^#]+)#/includefile($1,$idir)/eg;
$pkgtext =~ s/#INCLUDE:([^#^\n]+)#/includefile($1,$idir)/eg;
}
}
my @sublists = split('#NEW_INSTALL_LIST#',$pkgtext);
@ -459,7 +459,7 @@ sub includefile
s/\s+$//; #remove trailing spaces
next if /^\s*$/; #-- skip empty lines
next if ( /^\s*#/ &&
!/^\s*#INCLUDE:/ &&
!/^\s*#INCLUDE:[^#^\n]+#/ &&
!/^\s*#NEW_INSTALL_LIST#/ ); #-- skip comments
push(@text, $_);
}