Revision: 16438
http://sourceforge.net/p/edk2/code/16438
Author: vanjeff
Date: 2014-11-25 07:36:56 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Sync patch r16338 from main trunk.
BaseTools: Fix a cleanall issue.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
(cherry picked from commit 3cd9371f68ea90aab26b0cde94f1916f56036df2)
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/16338
Modified Paths:
--------------
branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py
Modified: branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py
===================================================================
--- branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py 2014-11-25
07:36:05 UTC (rev 16437)
+++ branches/UDK2014.SP1/BaseTools/Source/Python/build/build.py 2014-11-25
07:36:56 UTC (rev 16438)
@@ -997,11 +997,6 @@
try:
#os.rmdir(AutoGenObject.BuildDir)
RemoveDirectory(AutoGenObject.BuildDir, True)
- #
- # First should close DB.
- #
- self.Db.Close()
- RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath),
True)
except WindowsError, X:
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))
return True
@@ -1091,11 +1086,6 @@
try:
#os.rmdir(AutoGenObject.BuildDir)
RemoveDirectory(AutoGenObject.BuildDir, True)
- #
- # First should close DB.
- #
- self.Db.Close()
- RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath),
True)
except WindowsError, X:
EdkLogger.error("build", FILE_DELETE_FAILURE, ExtraData=str(X))
return True
@@ -1805,6 +1795,10 @@
self.SpawnMode = False
self._BuildModule()
+ if self.Target == 'cleanall':
+ self.Db.Close()
+ RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), True)
+
def CreateAsBuiltInf(self):
for Module in self.BuildModules:
Module.CreateAsBuiltInf()
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
