xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-24 15:05:36 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT-server/lib/xcat/plugins/packimage.pm

Browse Source
This commit is contained in:
GONG Jie
2017-12-31 23:59:59 +00:00
parent 97cae842bb
commit 6a60514ce2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/packimage.pm
View File

@ -102,8 +102,8 @@ sub process_request {
my $envars;
my $help;
my $version;
my $lock;
my $lock;
GetOptions(
"profile|p=s" => \$profile,
"arch|a=s" => \$arch,
@ -207,7 +207,7 @@ sub process_request {
}
$rootimg_dir = "$destdir/rootimg";
my $retcode;
($retcode,$lock)=xCAT::Utils->acquire_lock_imageop($rootimg_dir);
if($retcode){
@ -502,8 +502,8 @@ sub process_request {
}
$suffix = $method.".".$suffix;
unlink glob("$destdir/rootimg.*");
unlink glob("$destdir/rootimg.*");
if ($method =~ /cpio/) {
if (!$excludestr) {
$excludestr = "find . -xdev -print0 | cpio -H newc -o -0 | $compress -c - > ../rootimg.$suffix";
@ -553,7 +553,7 @@ sub process_request {
$callback->({ info => ["$outputmsg"] });
}else{
$callback->({ info => ["$outputmsg"] });
$callback->({ error => ["packimage failed while running: \n $excludestr"], errorcode => [1] });
$callback->({ error => ["packimage failed while running: \n $excludestr"], errorcode => [1] });
system("rm -rf $xcat_packimg_tmpfile");
return 1;
}