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

allow comments in otherpkgs.pkglists with updatenode

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5761 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor
2010-04-13 20:02:58 +00:00
parent 0cb7925062
commit 20818652a1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,8 +304,7 @@ sub makescript {
if (!$pkglist) { $pkglist=xCAT::SvrUtils->get_otherpkgs_pkglist_file_name("$::XCATROOT/share/xcat/$stat/$platform", $profile, $os, $arch); }
}
}
print "pkglist=$pkglist\n";
# print "pkglist=$pkglist\n";
if ($pkglist) {
my @otherpkgs=();
if (open(FILE1, "<$pkglist")) {
@@ -456,10 +455,13 @@ sub includefile
return "#INCLUDEBAD:cannot open $file#";
while(<INCLUDE>) {
chomp($_);
s/\s+$//; #remove trailing spaces
next if /^\s*$/; #-- skip empty lines
push(@text, $_);
chomp($_); #remove newline
s/\s+$//; #remove trailing spaces
next if /^\s*$/; #-- skip empty lines
next if ( /^\s*#/ &&
!/^\s*#INCLUDE:/ &&
!/^\s*#NEW_INSTALL_LIST#/ ); #-- skip comments
push(@text, $_);
}
close(INCLUDE);