From: qhuang8 <qhuang8@7335b38e-4728-0410-8992-fb3ffe349368>
Date: Mon, 30 Mar 2009 09:27:31 +0000 (+0000)
Subject: Search framework database file at the $(WORKSPACE)/Conf directory
X-Git-Url: http://git.etherboot.org/efi/basetools/.git/commitdiff_plain/c0cca9494665db418017ae6a656960e64024179f

Search framework database file at the $(WORKSPACE)/Conf directory

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1540 7335b38e-4728-0410-8992-fb3ffe349368
---

diff --git a/Source/Python/MigrationMsa2Inf/MigrationMsa2Inf.py b/Source/Python/MigrationMsa2Inf/MigrationMsa2Inf.py
index b25f6d4..01de212 100644
--- a/Source/Python/MigrationMsa2Inf/MigrationMsa2Inf.py
+++ b/Source/Python/MigrationMsa2Inf/MigrationMsa2Inf.py
@@ -193,20 +193,13 @@ def main():
         pass
 
 
-    FdbFile = ""
-    FdbPath = os.path.join(workspace, "Tools")
-    FdbPath = os.path.join(FdbPath, "Conf")
+    FdbPath = os.path.join(workspace, "Conf")
     FdbPath = os.path.join(FdbPath, "FrameworkDatabase.db")
     if os.path.exists(FdbPath):
         FdbFile = FdbPath
     else:
-        FdbPath = os.path.join(workspace, "Conf")
-        FdbPath = os.path.join(FdbPath, "FrameworkDatabase.db")
-        if os.path.exists(FdbPath):
-            FdbFile = FdbPath
-        else:
-            print "ERROR: E0001: WORKSPACE does not contain the FrameworkDatabase File.\n  Please run EdkSetup from the EDK II install directory.\n"
-            sys.exit(1)
+        print "ERROR: E0001: WORKSPACE does not contain the FrameworkDatabase File.\n  Please run EdkSetup from the EDK II install directory.\n"
+        sys.exit(1)
 
     Fdb = openDatabase(FdbFile)
     if (Fdb == 'None'):