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

update error

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7484 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2010-09-17 06:00:34 +00:00
parent 7eb3c72829
commit 2451ebdc03
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xCAT-UI/js/configure/update.js
View File

@ -246,7 +246,7 @@ function updateRpm()
$.cookie('xcatrepository', rpmPathType, { path: '/xcat', expires: 10 });
$('#update').empty();
$('#update').append("<p>update <b>" + rpms + "</b> from <b>" + rpmPath + "</b></p>");
$('#update').append("<p>Updating <b>" + rpms + "</b> from <b>" + rpmPath + "</b></p>");
$('#update').append("<img id='loadingpic' src='images/throbber.gif'>");
$('#rpm button').attr('disabled', 'true');
@ -269,10 +269,27 @@ function ShowUpdateResult(data)
{
var temp = 0;
$('#loadingpic').remove();
$('#update').append("Update finished.<br\>");
for (temp = 0; temp < data.rsp.length; temp++)
var resArray = data.rsp[0].split(/\n/);
if (('' == resArray[resArray.length - 1]) && (resArray.length > 1)){
$('#update').append(resArray[resArray.length - 2]);
}
else{
$('#update').append(resArray[resArray.length - 1]);
}
$('#update').append('<br\><a>Response Detail:</a>');
$('#update a').bind('click', function(){
$('#resDetail').show();
});
var resDetail = $('<div id="resDetail"></div>');
resDetail.hide();
$('#update').append(resDetail);
for (temp = 0; temp < resArray.length; temp++)
{
$('#update').append(data.rsp[temp] + "<br\>");
resDetail.append(resArray[temp] + "<br\>");
}
//update the rpm info

7
xCAT-server/lib/xcat/plugins/web.pm
View File

@ -295,7 +295,7 @@ sub web_update {
my $WebpageContent = undef;
my $RemoteRpmFilePath = undef;
my $LocalRpmFilePath = undef;
my @temp = undef;
if (xCAT::Utils->isLinux())
{
$os = xCAT::Utils->osver();
@ -318,7 +318,7 @@ sub web_update {
#create file, return error if failed.
unless ( open ($FileHandle, '>>', "/tmp/xCAT_update.yum.conf"))
{
$callback->({error=>"Create temp file eror!\n",errorcode=>[1]});
$callback->({error=>"Create temp file error!\n",errorcode=>[1]});
return;
}
@ -337,8 +337,7 @@ sub web_update {
}
#run the command and return the result
$ReturnInfo = readpipe($cmd);
@temp = split(/\n/, $ReturnInfo);
$callback->({info=>$temp[-1]});
$callback->({info=>$ReturnInfo});
}
#AIX
else