Merge git://git.denx.de/u-boot-x86

2015-07-31 20:16:04 -04:00 · 2015-07-31 20:16:04 -04:00 · 352bc77054
commit 352bc77054
parent dad17fd510 9649e152cb
1 changed files with 4 additions and 1 deletions
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@ -74,8 +74,11 @@ specified by tags you place in the commits. Use -n to do a dry run first."""
 settings.Setup(parser, options.project, '')
 (options, args) = parser.parse_args()

+if __name__ != "__main__":
+    pass
+
 # Run our meagre tests
-if options.test:
+elif options.test:
    import doctest

    sys.argv = [sys.argv[0]]