Just refactor the code. Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> --- scripts/lib/devtool/standard.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index aa95e6e..dfa45e8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -49,18 +49,16 @@ def add(args, config, basepath, workspace): return -1 srctree = os.path.abspath(args.srctree) - if os.path.exists(srctree): - if args.fetch: - if not os.path.isdir(srctree): - logger.error("Cannot fetch into source tree path %s as it exists and is not a directory" % srctree) - return 1 - elif os.listdir(srctree): - logger.error("Cannot fetch into source tree path %s as it already exists and is non-empty" % srctree) - return 1 - else: - if not args.fetch: - logger.error("Specified source tree %s could not be found" % srctree) + if os.path.exists(srctree) and args.fetch: + if not os.path.isdir(srctree): + logger.error("Cannot fetch into source tree path %s as it exists and is not a directory" % srctree) return 1 + elif os.listdir(srctree): + logger.error("Cannot fetch into source tree path %s as it already exists and is non-empty" % srctree) + return 1 + elif not args.fetch: + logger.error("Specified source tree %s could not be found" % srctree) + return 1 appendpath = os.path.join(config.workspace_path, 'appends') if not os.path.exists(appendpath): @@ -424,10 +422,9 @@ def modify(args, config, basepath, workspace): logger.error("recipe %s is already in your workspace" % args.recipename) return -1 - if not args.extract: - if not os.path.isdir(args.srctree): - logger.error("directory %s does not exist or not a directory (specify -x to extract source from recipe)" % args.srctree) - return -1 + if not args.extract and not os.path.isdir(args.srctree): + logger.error("directory %s does not exist or not a directory (specify -x to extract source from recipe)" % args.srctree) + return -1 tinfoil = setup_tinfoil() -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core