[Ipmitool-cvs] ipmitool/lib ipmi_hpmfwupg.c,1.13,1.14

[Dmitry F. <lo...@us...>]

Update of /cvsroot/ipmitool/ipmitool/lib
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29379/lib

Modified Files:
	ipmi_hpmfwupg.c 
Log Message:
Fix HPM.1 upgrade to apply to only given component when instructed to do so.

Patch submitted by Harshad Prabhu (Harshad.Prabhu at radisys dot com).
Quoting his email:

"Initiate Upgrade Action (HPMFWUPG_UPGRADE_ACTION_UPGRADE) was called
for all components even when single component was given on command line
(hpm upgrade <filename> component <id>). So calling this command only
after we decide whether the component is skipped."


Index: ipmi_hpmfwupg.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_hpmfwupg.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ipmi_hpmfwupg.c	11 Jul 2007 14:03:56 -0000	1.13
--- ipmi_hpmfwupg.c	29 Aug 2007 06:03:23 -0000	1.14
***************
*** 1817,1830 ****
     
  
-                /* Send initiate command */
-                initUpgActionCmd.req.componentsMask = pActionRecord->components;
-               /* Action is upgrade */
-                initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
-                rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
-                
-                if (rc != HPMFWUPG_SUCCESS)
- 			   {
- 			 		break;
- 			   }
                 /* Save component ID on which the upload is done */
                 componentIdByte = pActionRecord->components.ComponentBits.byte;
--- 1817,1820 ----
***************
*** 1898,1901 ****
--- 1888,1902 ----
                       break;
                    }
+                 
+                   /* Send initiate command */
+                   initUpgActionCmd.req.componentsMask = pActionRecord->components;
+                   /* Action is upgrade */
+                   initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
+                   rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+                
+                   if (rc != HPMFWUPG_SUCCESS)
+                   {
+                      break;
+                   }
                    
                    pVersionInfo = (VERSIONINFO*) &gVersionInfo[componentId];