From 9999f2b0f0ee7cc37bb18f8d8739ac22a092989f Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Fri, 10 Dec 2010 13:56:23 +0100
Subject: [PATCH] [molecule.specs.plugins] handle improper usage of
 merge_livecd_root and report to user

---
 molecule/specs/plugins/builtin_plugin.py | 46 +++++++++++++-----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/molecule/specs/plugins/builtin_plugin.py b/molecule/specs/plugins/builtin_plugin.py
index 2ed5025..757b2ec 100644
--- a/molecule/specs/plugins/builtin_plugin.py
+++ b/molecule/specs/plugins/builtin_plugin.py
@@ -451,28 +451,34 @@ class CdrootHandler(GenericExecutionStep, BuiltinHandlerMixin):
                     _("merging livecd root"), merge_dir,)
                 )
                 import stat
-                content = os.listdir(merge_dir)
-                for mypath in content:
-                    mysource = os.path.join(merge_dir, mypath)
-                    mydest = os.path.join(self.dest_root, mypath)
-                    copystat = False
+                try:
+                    content = os.listdir(merge_dir)
+                    for mypath in content:
+                        mysource = os.path.join(merge_dir, mypath)
+                        mydest = os.path.join(self.dest_root, mypath)
+                        copystat = False
 
-                    if os.path.islink(mysource):
-                        tolink = os.readlink(mysource)
-                        os.symlink(tolink, mydest)
-                    elif os.path.isfile(mysource) or os.path.islink(mysource):
-                        copystat = True
-                        shutil.copy2(mysource, mydest)
-                    elif os.path.isdir(mysource):
-                        copystat = True
-                        shutil.copytree(mysource, mydest)
-
-                    if copystat:
-                        user = os.stat(mysource)[stat.ST_UID]
-                        group = os.stat(mysource)[stat.ST_GID]
-                        os.chown(mydest, user, group)
-                        shutil.copystat(mysource, mydest)
+                        if os.path.islink(mysource):
+                            tolink = os.readlink(mysource)
+                            os.symlink(tolink, mydest)
+                        elif os.path.isfile(mysource) or os.path.islink(mysource):
+                            copystat = True
+                            shutil.copy2(mysource, mydest)
+                        elif os.path.isdir(mysource):
+                            copystat = True
+                            shutil.copytree(mysource, mydest)
 
+                        if copystat:
+                            user = os.stat(mysource)[stat.ST_UID]
+                            group = os.stat(mysource)[stat.ST_GID]
+                            os.chown(mydest, user, group)
+                            shutil.copystat(mysource, mydest)
+                except OSError as err:
+                    self._output.output("[%s|%s] %s: %s" % (
+                        blue("CdrootHandler"), darkred(self.spec_name),
+                        _("cannot merge livecd root, improper usage or system error"), err,)
+                    )
+                    return 1
         return 0
 
 class IsoHandler(GenericExecutionStep, BuiltinHandlerMixin):