[oe-commits] Markus Lehtonen : devtool: simplify few conditionals a bit

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 06f6b20f040d2e4eee577bb2111351523ee97af2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=06f6b20f040d2e4eee577bb2111351523ee97af2

Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Date:   Wed May 27 17:27:56 2015 +0300

devtool: simplify few conditionals a bit

Just refactor the code.

Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>

---

 scripts/lib/devtool/standard.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index aa95e6e..4b9cebb 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -57,10 +57,9 @@ def add(args, config, basepath, workspace):
             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)
-            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 +423,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()