sablink/molecule-plugins
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[molecule.specs.plugins] handle improper usage of merge_livecd_root and report to user

Browse Source
This commit is contained in:
Fabio Erculiani
2010-12-10 13:56:23 +01:00
parent df9e0af193
commit 9999f2b0f0
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecule/specs/plugins/builtin_plugin.py
+26 -20
View File
@@ -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):