From b8f24c73bd2da994711fe5e66005c2745b72fd64 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 28 Nov 2009 12:44:49 -0600 Subject: [PATCH] change os.path.is_dir() to isdir() --- ChangeLog | 4 ++++ modules/catalyst/util.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index db86f15c..4cafa434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ # Distributed under the GPL v2 # $Id$ + 28 Nov 2009; Andrew Gaffney + modules/catalyst/util.py: + change os.path.is_dir() to isdir() + 20 Sep 2009; Andrew Gaffney catalyst, files/catalyst.conf, modules/catalyst/target/generic_stage.py: Remove metadata_overlay option, since it doesn't make sense with diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py index 10957668..503ac14e 100644 --- a/modules/catalyst/util.py +++ b/modules/catalyst/util.py @@ -206,7 +206,7 @@ def remove_path(path, glob=True): cmd("chflags -R noschg " + x, \ "Could not remove immutable flag for path " \ + x) - if os.path.is_dir(x): + if os.path.isdir(x): try: shutil.rmtree(x) except: -- 2.26.2