From: Eric Edgar Date: Mon, 7 Nov 2005 16:27:54 +0000 (+0000) Subject: Remove large section of commented code X-Git-Tag: CATALYST_2_0_6_916~619 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3639a191c055a8413e2331963cef4bcd2d991f47;p=catalyst.git Remove large section of commented code git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@875 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 80d6ac85..0c6f40ac 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.365 2005/11/07 16:25:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.366 2005/11/07 16:27:54 rocket Exp $ + + 07 Nov 2005; Eric Edgar + modules/livecd_stage2_target.py: + Remove large section of commented code 07 Nov 2005; Eric Edgar modules/generic_stage_target.py, modules/stage1_target.py: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 0939945d..338cc500 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.49 2005/09/15 14:31:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.50 2005/11/07 16:27:54 rocket Exp $ """ Builder class for a LiveCD stage2 build. @@ -59,22 +59,6 @@ class livecd_stage2_target(generic_stage_target): if not os.path.exists(self.settings["target_path"]): os.makedirs(self.settings["target_path"]) -# def unpack(self): -# if not os.path.isdir(self.settings["source_path"]): -# generic_stage_target.unpack(self) -# else: -# if self.settings.has_key("AUTORESUME") \ -# and os.path.exists(self.settings["autoresume_path"]+"unpack"): -# print "Resume point detected, skipping unpack operation..." -# else: -# if not os.path.exists(self.settings["chroot_path"]): -# os.makedirs(self.settings["chroot_path"]) -# -# print "Copying livecd-stage1 result to new livecd-stage2 work directory..." -# cmd("rsync -a --delete "+self.settings["source_path"]+"/* "+self.settings["chroot_path"],\ -# "Error copying initial livecd-stage2") -# touch(self.settings["autoresume_path"]+"unpack") - def run_local(self): # what modules do we want to blacklist? if self.settings.has_key("livecd/modblacklist"):