[gentoo-commits] proj/catalyst:master commit in: modules/

["Matt Turner" <mattst88@gmail.com>]

commit:     366009cf6a893ab44c98ff7e7a08b8130d24e98a
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 08:31:09 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Feb  5 08:34:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=366009cf

Make sure shutil.rmtree() isn't passed a symlink

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=455022
Reviewed-by: Matt Turner <mattst88 <AT> gentoo.org>

---
 modules/generic_stage_target.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 12921d6..952fa4b 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1143,7 +1143,7 @@ class generic_stage_target(generic_target):
 						"/empty"].split()
 				for x in self.settings[self.settings["spec_prefix"]+"/empty"]:
 					myemp=self.settings["destpath"]+x
-					if not os.path.isdir(myemp):
+					if not os.path.isdir(myemp) or os.path.islink(myemp):
 						print x,"not a directory or does not exist, skipping 'empty' operation."
 						continue
 					print "Emptying directory",x