From: Eric Edgar Date: Tue, 26 Apr 2005 14:58:04 +0000 (+0000) Subject: fix minor bug in the purge code so that it actually runs the commands X-Git-Tag: CATALYST_2_0_6_916~758 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=987a1a6cb181314091b3fdfd94d14bed9003b4f7;p=catalyst.git fix minor bug in the purge code so that it actually runs the commands git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@625 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 763550e6..881891bc 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.237 2005/04/22 18:33:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.238 2005/04/26 14:58:04 rocket Exp $ + + 26 Apr 2005; Eric Edgar modules/catalyst_support.py, + modules/generic_stage_target.py: + fix minor bug in the purge code so that it actually runs the commands 22 Apr 2005; Eric Edgar modules/embedded_target.py, modules/generic_stage_target.py, modules/livecd_stage2_target.py, diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index df24966b..89a69ca4 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.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/catalyst_support.py,v 1.42 2005/04/21 18:18:46 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.43 2005/04/26 14:58:04 rocket Exp $ import sys,string,os,types,re,signal,traceback,md5,time # a function to turn a string of non-printable characters into a string of @@ -210,7 +210,7 @@ def parse_spec(mylines): continue else: myline=mylines[pos].split() - + if (len(myline)==0) or (myline[0][-1] != ":"): msg("Skipping invalid spec line "+repr(pos+1)) #strip colon: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 67459cfb..a1f1a69e 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.38 2005/04/22 18:33:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.39 2005/04/26 14:58:04 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -1013,10 +1013,10 @@ class generic_stage_target(generic_target): countdown(10,"Purging Caches ...") if self.settings.has_key("PURGE"): print "clearing autoresume ..." - self.clear_autoresume + self.clear_autoresume() print "clearing chroot ..." - self.clear_chroot + self.clear_chroot() print "clearing package cache ..." - self.clear_packages + self.clear_packages()