Changeset 58463 in vbox

Timestamp:

Oct 28, 2015 8:48:00 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103766

Message:

BaseTools/Source/Python/Common/TargetTxtClassObject.py: Merge fix.

File:

• trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/Common/TargetTxtClassObject.py (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Python/Common/TargetTxtClassObject.py

@@ -178 +178 @@
     if 'VBOX_TARGET_CONF' in os.environ:
         Target.LoadTargetTxtFile(os.path.abspath(os.environ['VBOX_TARGET_CONF']))
-    else:
+        return Target
     # VBox end
     Target.LoadTargetTxtFile(os.path.normpath(os.path.join(ConfDir, gDefaultTargetTxtFile)))