From: Eric Edgar Date: Thu, 28 Apr 2005 16:45:43 +0000 (+0000) Subject: Make purge operation a little less chatty, removed print statements X-Git-Tag: CATALYST_2_0_6_916~748 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fb4a7cb931db83d2f46962b9400822dcab0a6386;p=catalyst.git Make purge operation a little less chatty, removed print statements git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@635 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index da941ba7..92bf76e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.247 2005/04/28 16:42:14 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.248 2005/04/28 16:45:43 rocket Exp $ + + 28 Apr 2005; Eric Edgar + modules/generic_stage_target.py: + Make purge operation a little less chatty, removed print statements 28 Apr 2005; Eric Edgar livecd/cdtar/isolinux-2.13-cdtar.tar.bz2, diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 510bce38..cc566898 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.43 2005/04/28 13:46:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.44 2005/04/28 16:45:43 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -970,9 +970,7 @@ class generic_stage_target(generic_target): def clear_chroot(self): myemp=self.settings["chroot_path"] - if not os.path.isdir(myemp): - print myemp,"not a directory or does not exist, skipping 'chroot purge' operation." - else: + if os.path.isdir(myemp): print "Emptying directory",myemp # stat the dir, delete the dir, recreate the dir and set # the proper perms and ownership @@ -988,9 +986,7 @@ class generic_stage_target(generic_target): print "purging the pkgcache ..." myemp=self.settings["pkgcache_path"] - if not os.path.isdir(myemp): - print myemp,"not a directory or does not exist, skipping 'pkgcache purge' operation." - else: + if os.path.isdir(myemp): print "Emptying directory",myemp # stat the dir, delete the dir, recreate the dir and set # the proper perms and ownership @@ -1006,9 +1002,7 @@ class generic_stage_target(generic_target): if self.settings.has_key("AUTORESUME"): print "Removing AutoResume Points: ..." myemp=self.settings["autoresume_path"] - if not os.path.isdir(myemp): - print myemp,"not a directory or does not exist, skipping 'pkgcache purge' operation." - else: + if os.path.isdir(myemp): print "Emptying directory",myemp # stat the dir, delete the dir, recreate the dir and set # the proper perms and ownership