From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 53B02138878 for ; Tue, 5 Feb 2013 08:34:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AE39E0458; Tue, 5 Feb 2013 08:34:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96A6DE0458 for ; Tue, 5 Feb 2013 08:34:18 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 785E333DEBE for ; Tue, 5 Feb 2013 08:34:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 16EF0E4083 for ; Tue, 5 Feb 2013 08:34:16 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1360053242.366009cf6a893ab44c98ff7e7a08b8130d24e98a.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 366009cf6a893ab44c98ff7e7a08b8130d24e98a X-VCS-Branch: master Date: Tue, 5 Feb 2013 08:34:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dd4e7fae-5ee5-4433-a8e9-f5037794897b X-Archives-Hash: eaeeaa6cf007d683e963f4b3229e2d87 commit: 366009cf6a893ab44c98ff7e7a08b8130d24e98a Author: Guy Martin gentoo org> AuthorDate: Tue Feb 5 08:31:09 2013 +0000 Commit: Matt Turner gmail 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 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