From 01dd511f8af09fa4c06932c43af725d26104f2b4 Mon Sep 17 00:00:00 2001 From: linggao Date: Thu, 15 Apr 2010 18:02:44 +0000 Subject: [PATCH] bug fix git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5782 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Postage.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index 0c518e7df..e6a9c38f6 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -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, $_); }