[oe-commits] Paul Eggleton : devtool: better handling for recipes that don' t unpack source

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Sep 22 17:21:32 2015 +0100

devtool: better handling for recipes that don't unpack source

Some recipes don't extract any source (for example, opkg-keyrings). We
were producing a traceback in this case because we weren't checking if
the directory existed.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

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

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 2dbe372..ff79c05 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -334,9 +334,11 @@ def _extract_source(srctree, keep_temp, devbranch, d):
             else:
                 os.rmdir(patchdir)
 
-        if not os.listdir(srcsubdir):
-            raise DevtoolError("no source unpacked to S, perhaps the %s "
-                               "recipe doesn't use any source?" % pn)
+        if not os.path.exists(srcsubdir) or not os.listdir(srcsubdir):
+            raise DevtoolError("no source unpacked to S, either the %s "
+                               "recipe doesn't use any source or the "
+                               "correct source directory could not be "
+                               "determined" % pn)
 
         if not os.path.exists(os.path.join(srcsubdir, '.git')):
             bb.process.run('git init', cwd=srcsubdir)